Gallery: UX enhancement

Added new resources and modified source
to enhance the UI of Gallery application.

CRs-Fixed: 926603

Change-Id: I5ca7c49115ab4a3531b72a53380bb765d52707a2

4 files changed, 72 insertions, 65 deletions

diff --git a/res/menu/album.xml b/res/menu/album.xml
index 4db0e5100..00fd3ff17 100644
--- a/res/menu/album.xml
+++ b/res/menu/album.xml
@@ -15,17 +15,24 @@
 -->
 <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:icon="@drawable/camera"
             android:title="@string/switch_to_camera"
             android:showAsAction="ifRoom" />
     <item android:id="@+id/action_slideshow"
-            android:icon="@drawable/ic_menu_slideshow_holo_light"
+            android:icon="@drawable/slideshow"
             android:title="@string/slideshow"
-            android:showAsAction="never" />
+            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"/>
+<!--     <item android:id="@+id/action_group_by" -->
+<!--             android:title="@string/group_by" -->
+<!--             android:showAsAction="never"/> -->
+     <item android:id="@+id/action_view_type"
+           android:showAsAction="never"
+          />
+     <item android:id="@+id/action_sync_picasa_albums"
+            android:title="@string/sync_picasa_albums"
+            android:showAsAction="never"
+            android:visible="false" />
 </menu>
diff --git a/res/menu/filtershow_activity_menu.xml b/res/menu/filtershow_activity_menu.xml
index bb0b094dd..9a16e03d4 100644
--- a/res/menu/filtershow_activity_menu.xml
+++ b/res/menu/filtershow_activity_menu.xml
@@ -6,16 +6,16 @@
         android:enabled="false"
         android:visible="false"
         android:title="@string/share"/>
-    <item
-        android:id="@+id/undoButton"
-        android:icon="@drawable/filtershow_button_undo"
-        android:showAsAction="always"
-        android:title="@string/filtershow_undo"/>
-    <item
-        android:id="@+id/redoButton"
-        android:icon="@drawable/filtershow_button_redo"
-        android:showAsAction="always"
-        android:title="@string/filtershow_redo"/>
+<!--     <item -->
+<!--         android:id="@+id/undoButton" -->
+<!--         android:icon="@drawable/filtershow_button_undo" -->
+<!--         android:showAsAction="always" -->
+<!--         android:title="@string/filtershow_undo"/> -->
+<!--     <item -->
+<!--         android:id="@+id/redoButton" -->
+<!--         android:icon="@drawable/filtershow_button_redo" -->
+<!--         android:showAsAction="always" -->
+<!--         android:title="@string/filtershow_redo"/> -->
     <item
         android:id="@+id/resetHistoryButton"
         android:title="@string/reset"/>
@@ -24,11 +24,11 @@
         android:showAsAction="never"
         android:visible="true"
         android:title="@string/filtershow_show_info_panel" />
-    <item
-        android:id="@+id/showImageStateButton"
-        android:showAsAction="never"
-        android:visible="true"
-        android:title="@string/show_imagestate_panel" />
+<!--     <item -->
+<!--         android:id="@+id/showImageStateButton" -->
+<!--         android:showAsAction="never" -->
+<!--         android:visible="true" -->
+<!--         android:title="@string/show_imagestate_panel" /> -->
     <item
         android:id="@+id/manageUserPresets"
         android:showAsAction="never"
diff --git a/res/menu/operation.xml b/res/menu/operation.xml
index ffc5afa4a..b34cd6803 100644
--- a/res/menu/operation.xml
+++ b/res/menu/operation.xml
@@ -30,14 +30,14 @@
             android:showAsAction="ifRoom">
     </item>
     <item android:id="@+id/action_share"
-            android:icon="@drawable/ic_menu_share_holo_light"
+            android:icon="@drawable/multiselect_share"
             android:title="@string/share"
             android:visible="false"
             android:actionProviderClass="android.widget.ShareActionProvider"
             android:showAsAction="never">
     </item>
     <item android:id="@+id/action_delete"
-            android:icon="@drawable/ic_menu_trash_holo_light"
+            android:icon="@drawable/multiselect_delete"
             android:title="@string/delete"
             android:visible="false"
             android:showAsAction="ifRoom" />
diff --git a/res/menu/photo.xml b/res/menu/photo.xml
index 67e700b9f..d02a8c9e8 100644
--- a/res/menu/photo.xml
+++ b/res/menu/photo.xml
@@ -14,52 +14,52 @@
      limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/action_import"
-            android:title="@string/Import"
-            android:icon="@drawable/ic_menu_ptp_holo_light"
-            android:showAsAction="always|withText"
-            android:visible="false" />
-    <!-- Ideally, showAsAction for share_panorama and share should be reversed.
-         But, if share_panorama is set to never, it doesn't seem to get promoted
-         to the action bar and stays on the overflow menu. -->
-    <item android:id="@+id/action_share_panorama"
-            android:icon="@drawable/ic_menu_share_holo_light"
-            android:title="@string/share_panorama"
-            android:visible="false"
-            android:actionProviderClass="android.widget.ShareActionProvider"
-            android:showAsAction="ifRoom" />
-    <item android:id="@+id/action_share"
-            android:icon="@drawable/ic_menu_share_holo_light"
-            android:title="@string/share"
-            android:visible="false"
-            android:actionProviderClass="android.widget.ShareActionProvider"
-            android:showAsAction="never" />
-    <item android:id="@+id/action_delete"
-            android:icon="@drawable/ic_menu_trash_holo_light"
-            android:title="@string/delete"
-            android:visible="false"
-            android:showAsAction="never" />
+<!--     <item android:id="@+id/action_import" -->
+<!--             android:title="@string/Import" -->
+<!--             android:icon="@drawable/ic_menu_ptp_holo_light" -->
+<!--             android:showAsAction="always|withText" -->
+<!--             android:visible="false" /> -->
+<!--    Ideally, showAsAction for share_panorama and share should be reversed. -->
+<!--    But, if share_panorama is set to never, it doesn't seem to get promoted -->
+<!--          to the action bar and stays on the overflow menu. -->
+<!--     <item android:id="@+id/action_share_panorama" -->
+<!--             android:icon="@drawable/ic_menu_share_holo_light" -->
+<!--             android:title="@string/share_panorama" -->
+<!--             android:visible="false" -->
+<!--             android:actionProviderClass="android.widget.ShareActionProvider" -->
+<!--             android:showAsAction="ifRoom" /> -->
+<!--     <item android:id="@+id/action_share" -->
+<!--             android:icon="@drawable/ic_menu_share_holo_light" -->
+<!--             android:title="@string/share" -->
+<!--             android:visible="false" -->
+<!--             android:actionProviderClass="android.widget.ShareActionProvider" -->
+<!--             android:showAsAction="never" /> -->
+<!--     <item android:id="@+id/action_delete" -->
+<!--             android:icon="@drawable/ic_menu_trash_holo_light" -->
+<!--             android:title="@string/delete" -->
+<!--             android:visible="false" -->
+<!--             android:showAsAction="never" /> -->
     <item android:id="@+id/action_slideshow"
             android:icon="@drawable/ic_menu_slideshow_holo_light"
             android:title="@string/slideshow"
             android:showAsAction="never" />
-    <item android:id="@+id/action_edit"
-            android:title="@string/edit"
-            android:showAsAction="never"
-            android:visible="false" />
-    <item android:id="@+id/action_simple_edit"
-          android:title="@string/simple_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_edit" -->
+<!--             android:title="@string/edit" -->
+<!--             android:showAsAction="never" -->
+<!--             android:visible="false" /> -->
+<!--     <item android:id="@+id/action_simple_edit" -->
+<!--           android:title="@string/simple_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_trim"
             android:title="@string/trim_action"
             android:showAsAction="never" />