From 2612ce8d1ae5c3b363c2bc66f52020eba4138a1b Mon Sep 17 00:00:00 2001
From: Ray Chen <raychen@google.com>
Date: Wed, 19 Oct 2011 14:37:02 +0800
Subject: Fix 5213252 [UI] Updated action bar layouts and action orders

Change-Id: I46e993014e578be2e948ecea775522abc2f38a46
---
 res/menu/operation.xml | 18 +++++++++---------
 res/menu/photo.xml     | 24 ++++++++++++------------
 2 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'res/menu')

diff --git a/res/menu/operation.xml b/res/menu/operation.xml
index 9b198a7fa..0020240de 100644
--- a/res/menu/operation.xml
+++ b/res/menu/operation.xml
@@ -28,7 +28,7 @@
     <item android:id="@+id/action_delete"
             android:icon="@drawable/ic_menu_trash_holo_light"
             android:title="@string/delete"
-            android:showAsAction="ifRoom">
+            android:showAsAction="never">
         <menu>
             <item android:id="@+id/action_confirm_delete"
                     android:icon="@drawable/ic_menu_trash_holo_light"
@@ -38,8 +38,8 @@
                     android:title="@string/cancel" />
         </menu>
     </item>
-    <item android:id="@+id/action_show_on_map"
-            android:title="@string/show_on_map"
+    <item android:id="@+id/action_edit"
+            android:title="@string/edit"
             android:showAsAction="never"
             android:visible="false" />
     <item android:id="@+id/action_rotate_ccw"
@@ -48,20 +48,20 @@
     <item android:id="@+id/action_rotate_cw"
             android:showAsAction="never"
             android:title="@string/rotate_right" />
-    <item android:id="@+id/action_setas"
-            android:title="@string/set_image"
-            android:showAsAction="never"
-            android:visible="false" />
     <item android:id="@+id/action_crop"
             android:title="@string/crop_action"
             android:showAsAction="never"
             android:visible="false" />
+    <item android:id="@+id/action_setas"
+            android:title="@string/set_image"
+            android:showAsAction="never"
+            android:visible="false" />
     <item android:id="@+id/action_details"
             android:icon="@drawable/ic_menu_info_details"
             android:title="@string/details"
             android:showAsAction="never" />
-    <item android:id="@+id/action_edit"
-            android:title="@string/edit"
+    <item android:id="@+id/action_show_on_map"
+            android:title="@string/show_on_map"
             android:showAsAction="never"
             android:visible="false" />
 </menu>
diff --git a/res/menu/photo.xml b/res/menu/photo.xml
index 2349fabf1..dcf4b0a84 100644
--- a/res/menu/photo.xml
+++ b/res/menu/photo.xml
@@ -44,26 +44,26 @@
             android:icon="@drawable/ic_menu_slideshow_holo_light"
             android:title="@string/slideshow"
             android:showAsAction="never" />
-    <item android:id="@+id/action_details"
-            android:title="@string/details"
-            android:showAsAction="never" />
-    <item android:id="@+id/action_show_on_map"
-            android:title="@string/show_on_map"
-            android:showAsAction="never" />
+    <item android:id="@+id/action_edit"
+            android:title="@string/edit"
+            android:showAsAction="never"
+            android:visible="false" />
     <item android:id="@+id/action_rotate_ccw"
             android:showAsAction="never"
             android:title="@string/rotate_left" />
     <item android:id="@+id/action_rotate_cw"
             android:showAsAction="never"
             android:title="@string/rotate_right" />
+    <item android:id="@+id/action_crop"
+            android:title="@string/crop_action"
+            android:showAsAction="never" />
+    <item android:id="@+id/action_details"
+            android:title="@string/details"
+            android:showAsAction="never" />
     <item android:id="@+id/action_setas"
             android:title="@string/set_image"
             android:showAsAction="never" />
-    <item android:id="@+id/action_crop"
-            android:title="@string/crop_action"
+    <item android:id="@+id/action_show_on_map"
+            android:title="@string/show_on_map"
             android:showAsAction="never" />
-    <item android:id="@+id/action_edit"
-            android:title="@string/edit"
-            android:showAsAction="never"
-            android:visible="false" />
 </menu>
-- 
cgit v1.2.3