Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1739cf5 authored by Danny Baumann's avatar Danny Baumann
Browse files

Add back call stats feature.

Change-Id: If6deee65dc30854f4454a8cdd28fdbf3d529da04
parent bd62aa81
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -22,13 +22,16 @@ LOCAL_SRC_FILES += ../../providers/ContactsProvider/src/com/android/providers/co
                   ../../providers/ContactsProvider/src/com/android/providers/contacts/HanziToPinyin.java \
                   ../../providers/ContactsProvider/src/com/android/providers/contacts/util/NeededForTesting.java
LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \
    frameworks/support/v7/cardview/res frameworks/support/v7/recyclerview/res
    frameworks/support/v7/cardview/res frameworks/support/v7/recyclerview/res \
    frameworks/support/v7/appcompat/res frameworks/support/design/res
LOCAL_ASSET_DIR += $(LOCAL_PATH)/assets

LOCAL_AAPT_FLAGS := \
    --auto-add-overlay \
    --extra-packages android.support.v7.cardview \
    --extra-packages android.support.v7.recyclerview \
    --extra-packages android.support.v7.appcompat \
    --extra-packages android.support.design \
    --extra-packages com.android.incallui \
    --extra-packages com.android.contacts.common \
    --extra-packages com.android.phone.common
@@ -39,8 +42,10 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
    android-common \
    android-support-v13 \
    android-support-v4 \
    android-support-v7-appcompat \
    android-support-v7-cardview \
    android-support-v7-recyclerview \
    android-support-design \
    com.android.services.telephony.common \
    com.android.vcard \
    guava \
+11 −0
Original line number Diff line number Diff line
@@ -173,6 +173,17 @@
            </intent-filter>
        </activity>

        <activity android:name=".callstats.CallStatsDetailActivity"
            android:label="@string/callStatsDetailTitle"
            android:theme="@style/CallDetailActivityTheme"
            android:screenOrientation="portrait"
            android:icon="@mipmap/ic_launcher_phone" >
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>

        <activity android:name="com.android.contacts.common.test.FragmentTestActivity">
            <intent-filter>
                <category android:name="android.intent.category.TEST"/>
+3 −0
Original line number Diff line number Diff line
@@ -15,4 +15,7 @@
# Keep ExtendedLookupDirectories for assets/contacts_extensions.properties
-keep class com.android.dialer.lookup.ExtendedLookupDirectories { *; }

# Keep behavior class needed by design library
-keep class android.support.design.widget.AppBarLayout$ScrollingViewBehavior { *; }

-verbose
+34 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
    * Redistributions of source code must retain the above copyright
      notice, this list of conditions and the following disclaimer.
    * Redistributions in binary form must reproduce the above
      copyright notice, this list of conditions and the following
      disclaimer in the documentation and/or other materials provided
      with the distribution.
    * Neither the name of The Linux Foundation, Inc. nor the names of its
      contributors may be used to endorse or promote products derived
      from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
    style="@style/CallLogSpinnerStyle"
    android:layout_width="match_parent"
    android:layout_height="40dip"
    android:paddingLeft="8dip"
    android:paddingRight="8dip" />
+21 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:orientation="horizontal"
    android:paddingStart="@dimen/call_log_outer_margin"
    android:paddingEnd="@dimen/call_log_outer_margin"
    android:paddingBottom="@dimen/call_log_inner_margin">
    <Spinner
        android:id="@+id/filter_sub_spinner"
        android:layout_width="0dip"
        android:layout_height="@dimen/list_section_divider_min_height"
        android:layout_weight="1.2"
        android:layout_marginTop="5dip" />
    <Spinner
        android:id="@+id/filter_status_spinner"
        android:layout_width="0dip"
        android:layout_height="@dimen/list_section_divider_min_height"
        android:layout_weight="2"
        android:layout_marginTop="5dip" />
</LinearLayout>
Loading