summaryrefslogtreecommitdiffstats
path: root/res/menu
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-09-06 17:14:02 -0700
committerBobby Georgescu <georgescu@google.com>2012-09-09 00:15:48 -0700
commit4ee977a7af5495bbe2f7b032d85020ef8e1c2ef7 (patch)
tree8abf1154d96a318d0bc1ce27bcb69dc0073798e2 /res/menu
parent3048199327b1b59b95732b14b6f90308134e454f (diff)
downloadandroid_packages_apps_Snap-4ee977a7af5495bbe2f7b032d85020ef8e1c2ef7.tar.gz
android_packages_apps_Snap-4ee977a7af5495bbe2f7b032d85020ef8e1c2ef7.tar.bz2
android_packages_apps_Snap-4ee977a7af5495bbe2f7b032d85020ef8e1c2ef7.zip
Reskin: switching between filmstrip and grid in album
Bug: 7050303 Bug: 6541425 Allows switching between the filmstrip and the grid views within albums and launches camera roll in filmstrip mode by default. Also fixes animation issue when animating from full-screen to grid view. Change-Id: I2a37b92c129cc090fd807973f7e3e82fed207cd3
Diffstat (limited to 'res/menu')
-rw-r--r--res/menu/album.xml6
-rw-r--r--res/menu/photo.xml4
2 files changed, 9 insertions, 1 deletions
diff --git a/res/menu/album.xml b/res/menu/album.xml
index 93abccaea..ea2a7802d 100644
--- a/res/menu/album.xml
+++ b/res/menu/album.xml
@@ -18,10 +18,14 @@
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"
- android:showAsAction="ifRoom" />
+ android:showAsAction="never" />
<item android:id="@+id/action_select"
android:title="@string/select_item"
android:showAsAction="never" />
diff --git a/res/menu/photo.xml b/res/menu/photo.xml
index eb23684ad..0dcc3f70e 100644
--- a/res/menu/photo.xml
+++ b/res/menu/photo.xml
@@ -26,6 +26,10 @@
android:visible="false"
android:actionProviderClass="com.actionbarsherlock.widget.ShareActionProvider"
android:showAsAction="ifRoom" />
+ <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"