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

Commit 8d43a998 authored by Walter Jang's avatar Walter Jang Committed by Android Git Automerger
Browse files

am dd83ffe6: Merge "1/2 Sync Contacts and GoogleContacts manifests" into mnc-dev 

* commit 'dd83ffe6':
  1/2 Sync Contacts and GoogleContacts manifests
parents 1fa1dad8 dd83ffe6

AndroidManifest.xml

+5 −4
Original line number Diff line number Diff line
@@ -359,22 +359,23 @@ 
            </intent-filter>

        </activity>



        <!-- Create a new or edit an existing contact -->

        <!-- Edit or create a contact with all fields displayed. -->

        <activity

            android:name=".activities.ContactEditorActivity"

            android:label="@string/launcherActivityLabel"

            android:theme="@style/EditorActivityTheme"

            android:windowSoftInputMode="stateHidden|adjustResize">

            android:windowSoftInputMode="stateHidden|adjustResize"

            android:exported="false">



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

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

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

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

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

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

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

            </intent-filter>

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

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

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

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

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

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

src/com/android/contacts/activities/ContactEditorBaseActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -55,14 +55,14 @@ abstract public class ContactEditorBaseActivity extends ContactsActivity 
     *

     * Only used to open the "fully expanded" editor -- {@link ContactEditorActivity}.

     */

    public static final String ACTION_EDIT = "com.google.android.contacts.action.EDIT";

    public static final String ACTION_EDIT = "com.android.contacts.action.FULL_EDIT";



    /**

     * Intent action to insert a new contact with all available field inputs displayed.

     *

     * Only used to open the "fully expanded" editor -- {@link ContactEditorActivity}.

     */

    public static final String ACTION_INSERT = "com.google.android.contacts.action.INSERT";

    public static final String ACTION_INSERT = "com.android.contacts.action.FULL_INSERT";



    public static final String ACTION_JOIN_COMPLETED = "joinCompleted";

    public static final String ACTION_SAVE_COMPLETED = "saveCompleted";