diff options
| author | Ray Chen <raychen@google.com> | 2011-10-19 18:36:46 +0800 |
|---|---|---|
| committer | Ray Chen <raychen@google.com> | 2011-10-19 18:36:46 +0800 |
| commit | 0d94b210dfee1376a11aa53d07a7051a8c181787 (patch) | |
| tree | cb48107427bca064b1b56eb5eb34cb1e43e49e6d /res/menu | |
| parent | fbfa73361299c5a2284a5aaae8c2b824fd493cd9 (diff) | |
| parent | 71c8cbb746e34c36d643dcd96eb83aef72faa03f (diff) | |
| download | android_packages_apps_Gallery2-0d94b210dfee1376a11aa53d07a7051a8c181787.tar.gz android_packages_apps_Gallery2-0d94b210dfee1376a11aa53d07a7051a8c181787.tar.bz2 android_packages_apps_Gallery2-0d94b210dfee1376a11aa53d07a7051a8c181787.zip | |
resolved conflicts for merge of 71c8cbb7 to master
Change-Id: Ia5dc7bc54bba46218a53959076777e695ebb9dfe
Diffstat (limited to 'res/menu')
| -rw-r--r-- | res/menu/operation.xml | 18 | ||||
| -rw-r--r-- | res/menu/photo.xml | 24 |
2 files changed, 21 insertions, 21 deletions
diff --git a/res/menu/operation.xml b/res/menu/operation.xml index 6420c1e68..618f5f769 100644 --- a/res/menu/operation.xml +++ b/res/menu/operation.xml @@ -30,7 +30,7 @@ android:icon="@drawable/ic_menu_trash_holo_light" android:title="@string/delete" android:visible="false" - android:showAsAction="ifRoom"> + android:showAsAction="never"> <menu> <item android:id="@+id/action_confirm_delete" android:icon="@drawable/ic_menu_trash_holo_light" @@ -40,8 +40,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" @@ -52,21 +52,21 @@ android:showAsAction="never" android:visible="false" 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:visible="false" 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> |