summaryrefslogtreecommitdiffstats
path: root/res/menu
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-10-01 15:50:11 -0700
committerBobby Georgescu <georgescu@google.com>2012-10-01 15:56:51 -0700
commit3cf502a91b36bf6ce633f897505b0a2c3fc53ad5 (patch)
tree23815d26f31352e088d1e0a710a6fd6d341f8880 /res/menu
parentc58fe396fb7c6208740fa22a005e94a358b8266f (diff)
downloadandroid_packages_apps_Gallery2-3cf502a91b36bf6ce633f897505b0a2c3fc53ad5.tar.gz
android_packages_apps_Gallery2-3cf502a91b36bf6ce633f897505b0a2c3fc53ad5.tar.bz2
android_packages_apps_Gallery2-3cf502a91b36bf6ce633f897505b0a2c3fc53ad5.zip
Move grid/filmstrip switching to ActionBar title "spinner"
Bug: 7233818 Bug: 7240846 Bug: 7258973 Tapping the title of the album, whether in filmstrip or grid mode, allows switching between these modes using a menu. The album name is now displayed when viewing pictures in the filmstrip or zoomed in modes. Finally, no longer allow switching to grid mode when not appropriate. Change-Id: I4ee511feb7a74581fe185933ddd5110e5eb9feb0
Diffstat (limited to 'res/menu')
-rw-r--r--res/menu/album.xml4
-rw-r--r--res/menu/photo.xml4
2 files changed, 0 insertions, 8 deletions
diff --git a/res/menu/album.xml b/res/menu/album.xml
index ea2a7802d..4db0e5100 100644
--- a/res/menu/album.xml
+++ b/res/menu/album.xml
@@ -18,10 +18,6 @@
android:icon="@drawable/ic_menu_camera_holo_light"
android:title="@string/switch_to_camera"
android:showAsAction="ifRoom" />
- <item android:id="@+id/action_filmstrip"
- android:icon="@android:drawable/ic_dialog_map"
- android:title="@string/switch_photo_filmstrip"
- android:showAsAction="ifRoom" />
<item android:id="@+id/action_slideshow"
android:icon="@drawable/ic_menu_slideshow_holo_light"
android:title="@string/slideshow"
diff --git a/res/menu/photo.xml b/res/menu/photo.xml
index 5fe5187d9..942de3fc0 100644
--- a/res/menu/photo.xml
+++ b/res/menu/photo.xml
@@ -34,10 +34,6 @@
android:visible="false"
android:actionProviderClass="com.actionbarsherlock.widget.ShareActionProvider"
android:showAsAction="never" />
- <item android:id="@+id/action_grid"
- android:icon="@android:drawable/ic_dialog_dialer"
- android:title="@string/switch_photo_grid"
- android:showAsAction="ifRoom" />
<item android:id="@+id/action_delete"
android:icon="@drawable/ic_menu_trash_holo_light"
android:title="@string/delete"