SHOW_OR_CREATE to original behavior, new FastTrack API.
We had been overriding SHOW_OR_CREATE for awhile, but as
part of http://b/2087222 we added a separate API for
triggering FastTrack. This change returns SHOW_OR_CREATE to
its original behavior, and adds support for the new API.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b1014ad..68e66ba 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -239,11 +239,12 @@
/>
</activity>
+ <!-- Used to select display and sync groups -->
<activity android:name=".ui.DisplayGroupsActivity" android:label="@string/displayGroups" />
<activity
- android:name="ShowOrCreateActivity"
- android:theme="@style/ShowOrCreateTheme">
+ android:name=".ui.ShowOrCreateActivity"
+ android:theme="@style/FullyTranslucent">
<intent-filter>
<action android:name="com.android.contacts.action.SHOW_OR_CREATE_CONTACT" />
@@ -251,11 +252,17 @@
<data android:scheme="mailto" />
<data android:scheme="tel" />
</intent-filter>
+ </activity>
+
+ <!-- Used to show FastTrack window over a translucent activity, which is a
+ temporary hack until we add better framework support. -->
+ <activity
+ android:name=".ui.FastTrackActivity"
+ android:theme="@style/FullyTranslucent">
<intent-filter>
- <action android:name="com.android.contacts.action.SHOW_OR_CREATE_CONTACT" />
+ <action android:name="com.android.contacts.action.FAST_TRACK" />
<category android:name="android.intent.category.DEFAULT" />
- <data android:mimeType="vnd.android.cursor.item/person" android:host="contacts" />
<data android:mimeType="vnd.android.cursor.item/contact" android:host="com.android.contacts" />
</intent-filter>
</activity>
@@ -413,6 +420,3 @@
</application>
</manifest>
-
-
-