From a85c80227a56f3b7f917464096cd33877093616f Mon Sep 17 00:00:00 2001
From: Owen Lin <owenlin@google.com>
Date: Wed, 17 Aug 2011 22:07:43 +0800
Subject: Initial code for Gallery2.

fix: 5176434

Change-Id: I041e282b9c7b34ceb1db8b033be2b853bb3a992c
---
 res/menu/album.xml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 res/menu/album.xml

(limited to 'res/menu/album.xml')

diff --git a/res/menu/album.xml b/res/menu/album.xml
new file mode 100644
index 000000000..1e1f6ef1e
--- /dev/null
+++ b/res/menu/album.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 Google Inc.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/action_slideshow"
+            android:icon="@drawable/ic_menu_slideshow_holo_light"
+            android:title="@string/slideshow"
+            android:showAsAction="ifRoom" />
+    <item android:id="@+id/action_select"
+            android:title="@string/select_item"
+            android:showAsAction="never" />
+    <item android:id="@+id/action_group_by"
+            android:title="@string/group_by"
+            android:showAsAction="never"/>
+</menu>
-- 
cgit v1.2.3


From f4ef5226e1a460a936ca24374047380d7da4ee60 Mon Sep 17 00:00:00 2001
From: Chih-Chung Chang <chihchung@google.com>
Date: Thu, 3 May 2012 17:53:05 +0800
Subject: Add camera icon for camera roll.

Bug: 6411709
Change-Id: I2476dba7edb2b763f3b7727f0034fa300cf0287a
---
 res/menu/album.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'res/menu/album.xml')

diff --git a/res/menu/album.xml b/res/menu/album.xml
index 1e1f6ef1e..93abccaea 100644
--- a/res/menu/album.xml
+++ b/res/menu/album.xml
@@ -14,6 +14,10 @@
      limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/action_camera"
+            android:icon="@drawable/ic_menu_camera_holo_light"
+            android:title="@string/switch_to_camera"
+            android:showAsAction="ifRoom" />
     <item android:id="@+id/action_slideshow"
             android:icon="@drawable/ic_menu_slideshow_holo_light"
             android:title="@string/slideshow"
-- 
cgit v1.2.3


From 4ee977a7af5495bbe2f7b032d85020ef8e1c2ef7 Mon Sep 17 00:00:00 2001
From: Bobby Georgescu <georgescu@google.com>
Date: Thu, 6 Sep 2012 17:14:02 -0700
Subject: 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
---
 res/menu/album.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'res/menu/album.xml')

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" />
-- 
cgit v1.2.3


From 05b294512f3242cbd8b292029a56178fd6bae139 Mon Sep 17 00:00:00 2001
From: Bobby Georgescu <georgescu@google.com>
Date: Mon, 1 Oct 2012 15:50:11 -0700
Subject: 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
---
 res/menu/album.xml | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'res/menu/album.xml')

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"
-- 
cgit v1.2.3