summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDaisuke Miyakawa <dmiyakawa@google.com>2011-08-24 17:09:37 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-24 17:09:37 -0700
commit8ee708e755d7a803a52e0dca123466f4eb92f92a (patch)
tree6868cafdcc5928dc82c0f140b152fbff24ff05b5 /res
parentda78cfc32101610955f7013a16da2fcaa5f078b0 (diff)
parent48323baf5e02b5edd5be113e6fd71bbbed9f8d8f (diff)
downloadpackages_apps_Contacts-8ee708e755d7a803a52e0dca123466f4eb92f92a.tar.gz
packages_apps_Contacts-8ee708e755d7a803a52e0dca123466f4eb92f92a.tar.bz2
packages_apps_Contacts-8ee708e755d7a803a52e0dca123466f4eb92f92a.zip
Merge "Show "ALL CONTACTS" instead of magnifying glass icon"
Diffstat (limited to 'res')
-rw-r--r--res/menu/dialtacts_options.xml5
-rw-r--r--res/values/strings.xml3
2 files changed, 5 insertions, 3 deletions
diff --git a/res/menu/dialtacts_options.xml b/res/menu/dialtacts_options.xml
index cf67dab5b..f653242f8 100644
--- a/res/menu/dialtacts_options.xml
+++ b/res/menu/dialtacts_options.xml
@@ -16,9 +16,8 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/search_on_action_bar"
- android:title="@string/menu_search"
- android:icon="@android:drawable/ic_menu_search"
- android:showAsAction="always" />
+ android:title="@string/menu_all_contacts"
+ android:showAsAction="ifRoom" />
<!-- This should come after the other menus in CallLog and Dialpad -->
<item
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 965f0d151..af87ffddf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1034,6 +1034,9 @@
<!-- The menu item to share the currently viewed contact [CHAR LIMIT=30] -->
<string name="menu_share">Share</string>
+ <!-- The menu item to show all contacts in Phone entrance [CHAR LIMIT=30] -->
+ <string name="menu_all_contacts">All contacts</string>
+
<!-- Dialog title when picking the application to share a contact with. -->
<string name="share_via">Share contact via</string>