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

Commit 834aaac2 authored by Xiaojing Zhang's avatar Xiaojing Zhang
Browse files

Merge remote-tracking branch 'remotes/quic/ui_dev_2.0' into HEAD 

Change-Id: I3c8b98d0dc79e5f2d64cd0d882a54b7d9684fd52
parents d2dfb8d3 3d35c546

Android.mk

+0 −2
Original line number Original line Diff line number Diff line
@@ -36,8 +36,6 @@ LOCAL_PRIVILEGED_MODULE := true 




LOCAL_PROGUARD_FLAG_FILES := proguard.flags

LOCAL_PROGUARD_FLAG_FILES := proguard.flags





LOCAL_SDK_VERSION := current



include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)





# Use the folloing include to make our test apk.

# Use the folloing include to make our test apk.

AndroidManifest.xml

+43 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,8 @@ 
    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />

    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />

    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>

    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>

    <uses-permission android:name="com.android.firewall.READ_GRAVITY"/>

    <uses-permission android:name="com.android.firewall.WRITE_GRAVITY"/>

    <!-- Following used for QuickContacts -->

    <!-- Following used for QuickContacts -->

    <uses-permission android:name="android.permission.READ_CALL_LOG" />

    <uses-permission android:name="android.permission.READ_CALL_LOG" />

    <uses-permission android:name="android.permission.READ_SMS" />

    <uses-permission android:name="android.permission.READ_SMS" />
@@ -209,6 +211,11 @@ 
            android:label="@string/activity_title_contacts_filter"

            android:label="@string/activity_title_contacts_filter"

            android:theme="@style/ContactListFilterTheme" />

            android:theme="@style/ContactListFilterTheme" />





        <activity

            android:name=".activities.MemoryStatusActivity"

            android:label="@string/memory_status_title"

            android:theme="@style/ContactListFilterTheme" />



        <!-- Used to select display and sync groups -->

        <!-- Used to select display and sync groups -->

        <activity

        <activity

            android:name=".common.list.CustomContactListFilterActivity"

            android:name=".common.list.CustomContactListFilterActivity"
@@ -448,6 +455,42 @@ 
            android:label="@string/launcherActivityLabel"

            android:label="@string/launcherActivityLabel"

            android:theme="@style/BackgroundOnlyTheme" />

            android:theme="@style/BackgroundOnlyTheme" />





        <activity

            android:name=".activities.MultiPickContactActivity"

            android:windowSoftInputMode="stateHidden|adjustResize"

            android:screenOrientation="nosensor"

            android:theme="@android:style/Theme.Holo.Light"

            android:configChanges="orientation|keyboardHidden|layoutDirection">

            <intent-filter>

                <action android:name="com.android.contacts.action.MULTI_PICK" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:mimeType="vnd.android.cursor.dir/person"/>

                <data android:mimeType="vnd.android.cursor.dir/contact"/>

                <data android:mimeType="vnd.android.cursor.dir/raw_contact"/>

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.DELETE" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:mimeType="vnd.android.cursor.dir/person"/>

                <data android:mimeType="vnd.android.cursor.dir/contact"/>

                <data android:mimeType="vnd.android.cursor.dir/raw_contact"/>

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.contacts.action.MULTI_PICK_CALL"/>

                <category android:name="android.intent.category.DEFAULT"/>

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.contacts.action.MULTI_PICK_EMAIL"/>

                <category android:name="android.intent.category.DEFAULT"/>

                <data android:mimeType="vnd.android.cursor.dir/person"/>

                <data android:mimeType="vnd.android.cursor.dir/contact"/>

                <data android:mimeType="vnd.android.cursor.dir/raw_contact"/>

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.contacts.action.MULTI_PICK_SIM"/>

                <category android:name="android.intent.category.DEFAULT"/>

            </intent-filter>

        </activity>

        <service

        <service

            android:name=".common.vcard.VCardService"

            android:name=".common.vcard.VCardService"

            android:exported="false" />

            android:exported="false" />

res/drawable-hdpi/ic_call_log_list_incoming_call.png

0 → 100755
+830 B
Loading image diff...

res/drawable-hdpi/ic_call_log_list_missed_call.png

0 → 100755
+1.46 KiB
Loading image diff...

res/drawable-hdpi/ic_call_log_list_outgoing_call.png

0 → 100755
+840 B
Loading image diff...