Show phone menus correctly
- "Call settings" should come last
- actually "Call settings" should be "Settings"
Bug: 5205313
Change-Id: I759e0874e021736d490bcc50123dde60df21ff3b
diff --git a/res/menu/call_log_options.xml b/res/menu/call_log_options.xml
index c75c856..3d0fb6a 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 4dc62a8..02b1f7f 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 8a2fd91..cf67dab 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"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 11e7e38..965f0d1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1004,7 +1004,7 @@
<string name="call_disambig_title">Call using</string>
<!-- Menu item label for call settings [CHAR LIMIT=30] -->
- <string name="call_settings">Call settings</string>
+ <string name="call_settings">Settings</string>
<!-- Title for the sms disambiguation dialog -->
<string name="sms_disambig_title">Text using</string>