diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d7ee9c8..4bee141 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 fe09bec..b9edabc 100644
--- a/src/com/android/contacts/activities/ContactEditorBaseActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorBaseActivity.java
@@ -55,14 +55,14 @@
      *
      * 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";