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

Commit b38a92fc authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'ics-mr1' of... 

Merge branch 'ics-mr1' of https://android.googlesource.com/platform/packages/apps/Contacts into aosp
parents 13cfa4e0 5b39b5c3

AndroidManifest.xml

+21 −66
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />

    <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL" />

    <uses-permission android:name="com.android.voicemail.permission.READ_WRITE_ALL_VOICEMAIL" />

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

    <!-- allow broadcasting secret code intents that reboot the phone -->

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

    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -56,19 +57,6 @@ 
        android:hardwareAccelerated="true"

    >



        <!-- A list of recent calls -->

        <activity android:name=".activities.CallLogActivity"

            android:label="@string/recentCallsIconLabel"

            android:theme="@style/DialtactsTheme"

            android:uiOptions="splitActionBarWhenNarrow"

        >

            <intent-filter>

                <action android:name="com.android.phone.action.RECENT_CALLS" />

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

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

            </intent-filter>

        </activity>



        <!-- Intercept Dialer Intents for devices without a phone.

        This activity should have the same intent filters as the DialtactsActivity,

        so that its capturing the same events. Omit android.intent.category.LAUNCHER, because we
@@ -133,7 +121,7 @@ 
            android:screenOrientation="nosensor"

            android:enabled="@*android:bool/config_voice_capable"

            android:taskAffinity="android.task.contacts.phone"

            android:windowSoftInputMode="stateAlwaysHidden">

            android:windowSoftInputMode="stateAlwaysHidden|adjustNothing">

            <intent-filter>

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

                <category android:name="android.intent.category.DEFAULT" />
@@ -182,6 +170,11 @@ 
                <category android:name="android.intent.category.DEFAULT" />

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

            </intent-filter>

            <intent-filter android:label="@string/recentCallsIconLabel">

                <action android:name="com.android.phone.action.RECENT_CALLS" />

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

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

            </intent-filter>

        </activity>



        <!-- The main Contacts activity with the contact list, favorites, and groups. -->
@@ -197,6 +190,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

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

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

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

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.contacts.action.LIST_DEFAULT" />
@@ -274,7 +268,7 @@ 
            android:theme="@style/ContactPickerTheme"

            android:launchMode="singleTop"

            android:clearTaskOnLaunch="true"

        >

            android:uiOptions="splitActionBarWhenNarrow">

            <intent-filter>

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

                <category android:name="android.intent.category.DEFAULT" />
@@ -330,6 +324,18 @@ 
            android:exported="true"

        />



        <!-- Backwards compatibility: "Call log" from Gingerbread and earlier -->

        <activity-alias android:name="RecentCallsListActivity"

            android:targetActivity=".activities.DialtactsActivity"

            android:exported="true"

        />



        <!-- Backwards compatibility: "Call log" from ICS -->

        <activity-alias android:name=".activities.CallLogActivity"

            android:targetActivity=".activities.DialtactsActivity"

            android:exported="true"

        />



        <!-- An activity for joining contacts -->

        <activity android:name=".activities.JoinContactActivity"

            android:theme="@style/JoinContactActivityTheme"
@@ -422,26 +428,6 @@ 
            </intent-filter>

        </activity>



        <!-- Flushes the QuickContact IntentCache -->

        <receiver android:name=".quickcontact.PackageIntentReceiver">

            <intent-filter>

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

                <data android:scheme="package" />

            </intent-filter>

            <intent-filter>

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

                <data android:scheme="package" />

            </intent-filter>

            <intent-filter>

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

                <data android:scheme="package" />

            </intent-filter>

            <intent-filter>

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

                <data android:scheme="package" />

            </intent-filter>

        </receiver>



        <activity-alias android:name="ContactShortcut"

            android:targetActivity=".activities.ContactSelectionActivity"

            android:label="@string/shortcutContact"
@@ -580,37 +566,6 @@ 
            android:theme="@android:style/Theme.Translucent">

        </activity>



        <!-- LIVE FOLDERS -->

        <activity

            android:name=".ContactsLiveFolders$AllContacts"

            android:label="@string/liveFolderAll"

            android:icon="@mipmap/ic_launcher_folder_live_contacts">

            <intent-filter>

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

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

            </intent-filter>

        </activity>



        <activity

            android:name=".ContactsLiveFolders$StarredContacts"

            android:label="@string/liveFolderFavorites"

            android:icon="@mipmap/ic_launcher_folder_live_contacts_starred">

            <intent-filter>

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

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

            </intent-filter>

        </activity>



        <activity

            android:name=".ContactsLiveFolders$PhoneContacts"

            android:label="@string/liveFolderPhone"

            android:icon="@mipmap/ic_launcher_folder_live_contacts_phone">

            <intent-filter>

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

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

            </intent-filter>

        </activity>



        <!-- vCard related -->

        <activity android:name=".vcard.ImportVCardActivity"

            android:configChanges="orientation|screenSize|keyboardHidden"

res/drawable-hdpi/bg_status_contact_widget.9.png

+41 B (2.57 KiB)
Loading image diff...

res/drawable-hdpi/contacts_widget_preview.png

−7.43 KiB (13.1 KiB)
Loading image diff...

res/drawable-hdpi/ic_contact_picture_180_holo_dark.png

−50.5 KiB (2.27 KiB)
Loading image diff...

res/drawable-hdpi/ic_contact_picture_180_holo_light.png

−80.4 KiB (2.82 KiB)
Loading image diff...