summaryrefslogtreecommitdiffstats
path: root/res/menu
diff options
context:
space:
mode:
authorDaisuke Miyakawa <dmiyakawa@google.com>2011-08-24 13:43:06 -0700
committerDaisuke Miyakawa <dmiyakawa@google.com>2011-08-24 13:44:25 -0700
commit426f12afd335c010016c8e1c6c25657696f317e0 (patch)
tree02c30e7fdc9b53142040aa82a8f907380c35ea30 /res/menu
parentc39855fec7624e755ad46033c5a9a3f11b9cac29 (diff)
downloadandroid_packages_apps_Contacts-426f12afd335c010016c8e1c6c25657696f317e0.tar.gz
android_packages_apps_Contacts-426f12afd335c010016c8e1c6c25657696f317e0.tar.bz2
android_packages_apps_Contacts-426f12afd335c010016c8e1c6c25657696f317e0.zip
Show phone menus correctly
- "Call settings" should come last - actually "Call settings" should be "Settings" Bug: 5205313 Change-Id: I759e0874e021736d490bcc50123dde60df21ff3b
Diffstat (limited to 'res/menu')
-rw-r--r--res/menu/call_log_options.xml18
-rw-r--r--res/menu/dialpad_options.xml12
-rw-r--r--res/menu/dialtacts_options.xml4
3 files changed, 22 insertions, 12 deletions
diff --git a/res/menu/call_log_options.xml b/res/menu/call_log_options.xml
index c75c85685..3d0fb6acd 100644
--- a/res/menu/call_log_options.xml
+++ b/res/menu/call_log_options.xml
@@ -14,19 +14,23 @@
limitations under the License.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:id="@+id/delete_all"
- android:icon="@android:drawable/ic_menu_close_clear_cancel"
- android:title="@string/recentCalls_deleteAll"
- android:showAsAction="withText" />
<item
android:id="@+id/show_voicemails_only"
android:title="@string/menu_show_voicemails_only"
- android:showAsAction="withText" />
+ android:showAsAction="withText"
+ android:orderInCategory="1" />
<item
android:id="@+id/show_all_calls"
android:title="@string/menu_show_all_calls"
- android:showAsAction="withText" />
+ android:showAsAction="withText"
+ android:orderInCategory="1" />
+
+ <item
+ android:id="@+id/delete_all"
+ android:icon="@android:drawable/ic_menu_close_clear_cancel"
+ android:title="@string/recentCalls_deleteAll"
+ android:showAsAction="withText"
+ android:orderInCategory="1" />
</menu>
diff --git a/res/menu/dialpad_options.xml b/res/menu/dialpad_options.xml
index 4dc62a8ae..02b1f7f6a 100644
--- a/res/menu/dialpad_options.xml
+++ b/res/menu/dialpad_options.xml
@@ -18,22 +18,26 @@
android:id="@+id/menu_add_contacts"
android:icon="@android:drawable/ic_menu_add"
android:title="@string/recentCalls_addToContact"
- android:showAsAction="withText" />
+ android:showAsAction="withText"
+ android:orderInCategory="1" />
<item
android:id="@+id/menu_2s_pause"
android:icon="@drawable/ic_menu_2sec_pause"
android:title="@string/add_2sec_pause"
- android:showAsAction="withText" />
+ android:showAsAction="withText"
+ android:orderInCategory="1" />
<item
android:id="@+id/menu_add_wait"
android:icon="@drawable/ic_menu_wait"
android:title="@string/add_wait"
- android:showAsAction="withText" />
+ android:showAsAction="withText"
+ android:orderInCategory="1" />
<item
android:id="@+id/menu_call_settings_dialpad"
android:title="@string/call_settings"
android:icon="@drawable/ic_menu_settings_holo_light"
- android:showAsAction="withText" />
+ android:showAsAction="withText"
+ android:orderInCategory="1" />
</menu>
diff --git a/res/menu/dialtacts_options.xml b/res/menu/dialtacts_options.xml
index 8a2fd91e2..cf67dab5b 100644
--- a/res/menu/dialtacts_options.xml
+++ b/res/menu/dialtacts_options.xml
@@ -20,11 +20,13 @@
android:icon="@android:drawable/ic_menu_search"
android:showAsAction="always" />
+ <!-- This should come after the other menus in CallLog and Dialpad -->
<item
android:id="@+id/menu_call_settings"
android:title="@string/call_settings"
android:icon="@drawable/ic_menu_settings_holo_light"
- android:showAsAction="withText" />
+ android:showAsAction="withText"
+ android:orderInCategory="2" />
<item
android:id="@+id/filter_option"