diff options
| author | Walter Jang <wjang@google.com> | 2015-06-16 14:26:09 -0700 |
|---|---|---|
| committer | Walter Jang <wjang@google.com> | 2015-06-16 15:27:13 -0700 |
| commit | ef711f78432f8f188a5322851c355809ac9137cd (patch) | |
| tree | 8ac4a1d85d56b7d0919fdc28f43cd3c836b27a6a | |
| parent | 398cd4b1fbfa7d2fabfc4addf6a156a841a5aa6a (diff) | |
| download | packages_apps_Contacts-ef711f78432f8f188a5322851c355809ac9137cd.tar.gz packages_apps_Contacts-ef711f78432f8f188a5322851c355809ac9137cd.tar.bz2 packages_apps_Contacts-ef711f78432f8f188a5322851c355809ac9137cd.zip | |
1/2 Sync Contacts and GoogleContacts manifests
Also removed "com.google" from the full editor
action names.
Change-Id: I1b8afb8f8a32ab1fe60c7174d092830d81dcee07
| -rw-r--r-- | AndroidManifest.xml | 9 | ||||
| -rw-r--r-- | src/com/android/contacts/activities/ContactEditorBaseActivity.java | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d7ee9c87e..4bee14184 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -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" /> diff --git a/src/com/android/contacts/activities/ContactEditorBaseActivity.java b/src/com/android/contacts/activities/ContactEditorBaseActivity.java index fe09becfd..b9edabcda 100644 --- a/src/com/android/contacts/activities/ContactEditorBaseActivity.java +++ b/src/com/android/contacts/activities/ContactEditorBaseActivity.java @@ -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"; |