Gallery2: modify some UI interface according to UI document.

1. Modify layout of actionbar when selected photo;
2. Modify menu string in Video Page;
3. Modify compare button's position in photo editor;
4. Modify bottom panel's height in photo editor;
5. Set video play icon to 48dp in PhotoView;

Change-Id: Ic660d5dde87998e87eb02482ac7ba7e2ba2f0bb1
CRs-Fixed: 1010984

2 files changed, 11 insertions, 8 deletions

diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 4d2e291c1..3ceb7a09a 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -657,6 +657,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
             menu.findItem(R.id.action_sync_picasa_albums).setVisible(mIsVideoScreen);
             MenuItem item = menu.findItem(R.id.action_view_type);
             updateMenuTitle(item);
+            updateMenuTitle(menu.findItem(R.id.action_select));
 
         }
         //actionBar.setSubtitle(null);
@@ -920,10 +921,13 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
         }
     }
 
-     public void updateMenuTitle(MenuItem item) {
-
-       item.setTitle(mViewType ? R.string.action_viewtype_list
-        : R.string.action_viewtype_grid);
+    public void updateMenuTitle(MenuItem item) {
+        if (item.getItemId() == R.id.action_view_type) {
+            item.setTitle(mViewType ? R.string.action_viewtype_list
+                    : R.string.action_viewtype_grid);
+        } else if (item.getItemId() == R.id.action_select) {
+            item.setTitle(mIsVideoScreen ? R.string.select_video : R.string.select_item);
+        }
     }
 
     private void switchView() {
diff --git a/src/com/android/gallery3d/app/GalleryActionBar.java b/src/com/android/gallery3d/app/GalleryActionBar.java
index 71bb6381a..ebec5731b 100644
--- a/src/com/android/gallery3d/app/GalleryActionBar.java
+++ b/src/com/android/gallery3d/app/GalleryActionBar.java
@@ -451,10 +451,9 @@ public class GalleryActionBar {
         }
     }
 
-    public void setBackGroundTransparent()
-    {
-        mActionBar.setBackgroundDrawable(new ColorDrawable(Color.argb(66, 0, 0, 0)));
-
+    public void setBackGroundTransparent() {
+        mActionBar.setBackgroundDrawable(
+                new ColorDrawable(mContext.getResources().getColor(R.color.photo_page_action_bar)));
     }
 
     public void setBackGroundDefault()