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

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

Merge branch 'donut' of git://github.com/Wysie/android_packages_apps_Contacts into HEAD 

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/contacts_preferences.xml
	src/com/android/contacts/ContactsPreferences.java
	src/com/android/contacts/RecentCallsListActivity.java
	src/com/android/contacts/TwelveKeyDialer.java
	src/com/android/contacts/ViewContactActivity.java
parents 6bea5692 77949bf4

AndroidManifest.xml

+11 −2
Original line number Diff line number Diff line
@@ -24,12 +24,14 @@ 
    <uses-permission android:name="android.permission.CALL_PRIVILEGED" />

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

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

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

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

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

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

    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.mail" />

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

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

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



    <application

        android:label="@string/contactsList"
@@ -334,7 +336,6 @@ 
                <data android:mimeType="image/*" />

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

            </intent-filter>       

            />

        </activity>        



        <!-- Activity used to select the groups that should be synced -->
@@ -381,6 +382,14 @@ 
        <activity android:name=".ImportVCardActivity"

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

            

	<!-- Wysie_Soh: Custom Intents -->

	<activity android:name="ContactsPreferences">

            <intent-filter>

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

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

            </intent-filter>

        </activity>



    </application>

</manifest>

AndroidManifest.xml~

0 → 100644
+389 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2006 The Android Open Source Project

     Copyright (c) 2009, Code Aurora Forum. All rights reserved.



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at

  

          http://www.apache.org/licenses/LICENSE-2.0

  

     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.contacts"

        android:sharedUserId="android.uid.shared"

>

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

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

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

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

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

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

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

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

    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.mail" />

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

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

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



    <application

        android:label="@string/contactsList"

        android:icon="@drawable/ic_launcher_contacts"

        android:process="android.process.acore"

        android:taskAffinity="android.task.contacts"

    >



        <!-- A virtual 12 key dialer -->

        <activity android:name="TwelveKeyDialer"

            android:launchMode="singleTop"

        >

            <intent-filter>

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

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

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

            </intent-filter>

        </activity>



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

        <activity android:name="RecentCallsListActivity"

            android:label="@string/recentCallsIconLabel"

        >

            <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>



        <!-- Tab container for TwelveKeyDialer and RecentCallsList -->

        <activity android:name="DialtactsActivity"

            android:label="@string/launcherDialer"

            android:theme="@android:style/Theme.NoTitleBar"

            android:launchMode="singleTask"

            android:clearTaskOnLaunch="true"

            android:icon="@drawable/ic_launcher_phone"

            android:screenOrientation="nosensor"

        >

            <intent-filter>

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

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

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

                <data android:mimeType="vnd.android.cursor.item/phone" />

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

            </intent-filter>

            <intent-filter>

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

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

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

                <data android:scheme="voicemail" />

            </intent-filter>

            <intent-filter>

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

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

            </intent-filter>

            <intent-filter>

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

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

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

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

            </intent-filter>

            <intent-filter>

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

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

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

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

                <data android:scheme="tel" />

            </intent-filter>

            <intent-filter>

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

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

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

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

            </intent-filter>

            <intent-filter>

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

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

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

            </intent-filter>

        </activity>

        

        <!-- An empty activity that presents the DialtactActivity's Contacts tab -->

        <activity-alias android:name="DialtactsContactsEntryActivity"

            android:targetActivity="DialtactsActivity"

            android:label="@string/contactsList"

            android:icon="@drawable/ic_launcher_contacts"

        >

            <intent-filter>

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

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

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

            </intent-filter>



            <intent-filter>

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

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

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

            </intent-filter>

            

            <intent-filter>

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

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

            </intent-filter>

        </activity-alias>



        <!-- An empty activity that presents the DialtactActivity's Favorites tab -->

        <activity-alias android:name="DialtactsFavoritesEntryActivity"

            android:targetActivity="DialtactsActivity"

            android:label="@string/strequentList"

            android:icon="@drawable/ic_launcher_contacts"

        >

            <intent-filter>

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

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

            </intent-filter>

        </activity-alias>

        

        <!-- The actual list of contacts, usually embedded in ContactsActivity -->

        <activity android:name="ContactsListActivity"

            android:label="@string/contactsList"

            android:clearTaskOnLaunch="true"

        >

            <intent-filter>

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

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

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

            </intent-filter>



            <intent-filter>

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

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

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

            </intent-filter>



            <intent-filter>

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

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

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

            </intent-filter>



            <intent-filter>

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

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

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

            </intent-filter>



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

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

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

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

            </intent-filter>

            

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

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

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

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

            </intent-filter>



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

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

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

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

            </intent-filter>



            <intent-filter>

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

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

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

            </intent-filter>

<!--

            <intent-filter android:label="Add To Contacts">

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

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

                <data android:scheme="mailto" />

                <data android:scheme="tel" />

            </intent-filter>

-->

            <intent-filter>

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

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

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

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

                <data android:mimeType="vnd.android.cursor.dir/postal-address" />

            </intent-filter>



            <intent-filter>

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

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

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

                <data android:mimeType="vnd.android.cursor.item/phone" />

                <data android:mimeType="vnd.android.cursor.item/postal-address" />

            </intent-filter>



            <intent-filter>

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

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

            </intent-filter>



            <meta-data android:name="android.app.searchable"

                android:resource="@xml/searchable"

            />

        </activity>



        <activity android:name="ShowOrCreateActivity"

            android:theme="@android:style/Theme.Translucent.NoTitleBar">

            <intent-filter>

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

                <data android:scheme="mailto" />

                <data android:scheme="tel" />

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

            </intent-filter>

        </activity>



        <activity-alias android:name="ContactShortcut"

            android:targetActivity="ContactsListActivity"

            android:label="@string/shortcutContact"

            android:icon="@drawable/ic_launcher_shortcut_contact">



            <intent-filter>

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

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

            </intent-filter>



        </activity-alias>



        <activity-alias android:name="alias.DialShortcut"

            android:targetActivity="ContactsListActivity"

            android:label="@string/shortcutDialContact"

            android:icon="@drawable/ic_launcher_shortcut_contact">



            <intent-filter>

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

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

            </intent-filter>



        </activity-alias>



        <activity-alias android:name="alias.MessageShortcut"

            android:targetActivity="ContactsListActivity"

            android:label="@string/shortcutMessageContact"

            android:icon="@drawable/ic_launcher_shortcut_contact">



            <intent-filter>

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

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

            </intent-filter>



        </activity-alias>



        <activity android:name="CallDetailActivity"

            android:label="@string/callDetailTitle"

            android:theme="@style/TallTitleBarTheme"

        >

            <intent-filter>

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

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

                <data android:mimeType="vnd.android.cursor.item/calls" />

            </intent-filter>

        </activity>



        <!-- Views the details of a single contact -->

        <activity android:name="ViewContactActivity"

            android:label="@string/viewContactTitle"

            android:theme="@style/TallTitleBarTheme"

        >

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

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

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

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

            </intent-filter>

        </activity>



        <!-- Edits the details of a single contact -->

        <activity android:name="EditContactActivity"

                android:windowSoftInputMode="stateVisible|adjustResize">

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

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

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

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

            </intent-filter>

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

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

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

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

            </intent-filter>

        </activity>



        <!-- Attaches a photo to a contact. Started from external applications -->

        <activity android:name="AttachImage"

            android:label="@string/attachToContact"

            android:taskAffinity="">

            <intent-filter>

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

                <data android:mimeType="image/*" />

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

            </intent-filter>       

        </activity>        



        <!-- Activity used to select the groups that should be synced -->

        <activity android:name="ContactsGroupSyncSelector"

            android:label="@string/seclectSyncGroups_title"

        />



        <!-- Makes .ContactsListActivity the search target for any activity in Contacts -->

        <meta-data android:name="android.app.default_searchable" 

                   android:value=".ContactsListActivity" />





        <!-- LIVE FOLDERS -->

        <activity

            android:name=".ContactsLiveFolders$AllContacts"

            android:label="@string/liveFolderAll"

            android:icon="@drawable/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="@drawable/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="@drawable/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>



        <activity android:name=".ImportVCardActivity"

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

            

	<!-- Wysie_Soh: Custom Intents -->

	<activity android:name="ContactsPreferences">

            <intent-filter>

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

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

            </intent-filter>

        </activity>



    </application>

</manifest>

res/drawable-finger/dial_num_1_with_vm.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_pressed="true"

        android:drawable="@drawable/dial_num_1_with_vm_blk" />

    <item android:state_focused="true"

        android:drawable="@drawable/dial_num_1_with_vm_blk" />

    <item

        android:drawable="@drawable/dial_num_1_with_vm_wht" />

</selector>

res/drawable-finger/dial_num_1_with_vm_blk.png

0 → 100644
+890 B
Loading image diff...

res/drawable-finger/dial_num_1_with_vm_wht.png

0 → 100644
+1.71 KiB
Loading image diff...