summaryrefslogtreecommitdiffstats
path: root/res/menu
diff options
context:
space:
mode:
authorDaisuke Miyakawa <dmiyakawa@google.com>2012-02-23 08:31:32 -0800
committerDaisuke Miyakawa <dmiyakawa@google.com>2012-02-23 08:31:32 -0800
commite09037ea7447a512065e2407670a7753de57a20e (patch)
treef1254adf8ad4c6cb728f82e87f26a46ee37eead6 /res/menu
parentf30723782e801deaf159aea2443e9507596ef11d (diff)
parentf8bb328e77ef1e648fc52467b221e23d4274b0db (diff)
downloadpackages_apps_Contacts-e09037ea7447a512065e2407670a7753de57a20e.tar.gz
packages_apps_Contacts-e09037ea7447a512065e2407670a7753de57a20e.tar.bz2
packages_apps_Contacts-e09037ea7447a512065e2407670a7753de57a20e.zip
resolved conflicts for merge of f8bb328e to master
Change-Id: I95f25c8a36d0992d40f6927a3e059eff67bff4a6
Diffstat (limited to 'res/menu')
-rw-r--r--res/menu/dialtacts_options.xml12
1 files changed, 12 insertions, 0 deletions
diff --git a/res/menu/dialtacts_options.xml b/res/menu/dialtacts_options.xml
index 21161b181..3158598f7 100644
--- a/res/menu/dialtacts_options.xml
+++ b/res/menu/dialtacts_options.xml
@@ -37,4 +37,16 @@
android:icon="@drawable/ic_add_contact_holo_dark"
android:title="@string/menu_newContact"
android:showAsAction="ifRoom" />
+
+ <!-- Ugly hack: empty item never clickable.
+ This is for forcing search icon on left even when there's a single item
+ in the bottom ActionBar.
+ We intentionally don't use android:icon to avoid other issues around item with
+ a null icon.
+
+ TODO: look for better idea. -->
+ <item
+ android:id="@+id/fake_menu_item"
+ android:actionLayout="@layout/empty2"
+ android:showAsAction="ifRoom" />
</menu>