Contact picker: add search icon & hide searchview
Hide/unhide the SearchView when you click a seach menu item.
This is the first and more important step for b/16190113.
In a later CL, I might remove the SearchView and replace it
with the custom actionbar view created by dialer & used
in PeopleActivity.
Also merged JoinContactActivity into ContactSelectionActivity.
Bug: 16190113
Change-Id: I04bf7d22dffbf7f104362b17c9064cb386a01abe
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 69d211e..1175fe7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -176,6 +176,11 @@
<data android:mimeType="vnd.android.cursor.item/postal-address_v2" />
<data android:mimeType="vnd.android.cursor.item/postal-address" />
</intent-filter>
+
+ <intent-filter>
+ <action android:name="com.android.contacts.action.JOIN_CONTACT" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
</activity>
<!-- Backwards compatibility: somebody may have hard coded this activity name -->
@@ -195,17 +200,6 @@
android:exported="true"
/>
- <!-- An activity for joining contacts -->
- <activity android:name=".activities.JoinContactActivity"
- android:theme="@style/JoinContactActivityTheme"
- android:clearTaskOnLaunch="true"
- >
- <intent-filter>
- <action android:name="com.android.contacts.action.JOIN_CONTACT" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
-
<!-- Used to set options -->
<activity
android:name=".preference.ContactsPreferenceActivity"