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

10 files changed, 22 insertions, 19 deletions

diff --git a/res/layout/action_mode.xml b/res/layout/action_mode.xml
index f941b6427..ec4704d92 100644
--- a/res/layout/action_mode.xml
+++ b/res/layout/action_mode.xml
@@ -35,15 +35,10 @@
                 android:textColor="#8A000000"
                 android:textSize="20sp"
                 android:singleLine="true"
-                android:gravity="left|center_vertical"
-                android:paddingEnd="25dip"
+                android:gravity="start|center_vertical"
+                android:paddingEnd="15dip"
+                android:paddingStart="0dp"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent" />
     </FrameLayout>
-    <ImageView android:layout_marginStart="16dip"
-            android:layout_marginEnd="8dip"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="bottom"
-            android:src="@drawable/cab_divider_vertical_dark" />
 </LinearLayout>
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 56666ece3..87adf730b 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -51,8 +51,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
-                    android:layout_marginRight="10dp"
-                    android:layout_marginTop="104dp"
+                    android:layout_marginRight="@dimen/compare_margin_right"
+                    android:layout_marginTop="@dimen/compare_margin_top"
                     android:background="@android:color/transparent"
                     android:src="@drawable/comparison_before"
                     android:visibility="visible" />
diff --git a/res/layout/filtershow_bottom_panel.xml b/res/layout/filtershow_bottom_panel.xml
index abefcba39..80efe1a08 100644
--- a/res/layout/filtershow_bottom_panel.xml
+++ b/res/layout/filtershow_bottom_panel.xml
@@ -31,7 +31,7 @@
 <com.android.gallery3d.filtershow.CenteredLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/bottom_panel"
     android:layout_width="match_parent"
-    android:layout_height="48dip"
+    android:layout_height="match_parent"
     android:layout_gravity="center|bottom"
     android:background="@color/bottom_panel_background_color"
     android:orientation="vertical">
diff --git a/res/layout/filtershow_main_panel.xml b/res/layout/filtershow_main_panel.xml
index b9b18a036..5b0510a1c 100644
--- a/res/layout/filtershow_main_panel.xml
+++ b/res/layout/filtershow_main_panel.xml
@@ -47,7 +47,7 @@
     <FrameLayout
             android:id="@+id/bottom_panel_container"
             android:layout_width="match_parent"
-            android:layout_height="48dip"
+            android:layout_height="@dimen/bottom_panel_height"
             android:visibility="visible"
             android:layout_gravity="center"/>
 </LinearLayout>
diff --git a/res/layout/photopage_bottom_controls.xml b/res/layout/photopage_bottom_controls.xml
index 3f19af150..f52a704a7 100644
--- a/res/layout/photopage_bottom_controls.xml
+++ b/res/layout/photopage_bottom_controls.xml
@@ -5,7 +5,7 @@
     android:layout_height="56dp"
     android:layout_alignParentBottom="true"
     android:layout_gravity="bottom"
-    android:background="#42000000"
+    android:background="@color/photo_page_bottom_panel"
     android:gravity="bottom"
     android:orientation="horizontal"
     android:visibility="gone" >
diff --git a/res/values-zh-rCN/filtershow_strings.xml b/res/values-zh-rCN/filtershow_strings.xml
index 62001b1c7..0b624759c 100644
--- a/res/values-zh-rCN/filtershow_strings.xml
+++ b/res/values-zh-rCN/filtershow_strings.xml
@@ -38,7 +38,7 @@
     <string name="size" msgid="4639404642236356037">"大小"</string>
     <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"设置"</string>
-    <string name="unsaved" msgid="8704442449002374375">"是否放弃当前图片的操作？"</string>
+    <string name="unsaved" msgid="8704442449002374375">"是否放弃对当前图片的操作？"</string>
     <string name="save_before_exit" msgid="2680660633675916712">"放弃更改？"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"保存并退出"</string>
     <string name="discard">"放弃"</string>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 9fd91923f..6c4a79178 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -32,6 +32,8 @@
     <!-- configuration for photo page -->
     <color name="photo_background">#1A1A1A</color>
     <color name="photo_placeholder">#333</color>
+    <color name="photo_page_action_bar">#8A000000</color>
+    <color name="photo_page_bottom_panel">#8A000000</color>
 
     <!-- configuration for manage cache page -->
     <color name="cache_background">#1A1A1A</color>
@@ -81,7 +83,7 @@
     <color name="edit_background">#212121</color>
     <color name="edit_actionbar_background">#8A000000</color>
     <color name="dialog_button_color">#009688</color>
-    <color name="timeline_title_text_color">#26000000</color>
-    <color name="timeline_title_number_text_color">#1a000000</color>
+    <color name="timeline_title_text_color">#8A000000</color>
+    <color name="timeline_title_number_text_color">#42000000</color>
     <color name="timeline_title_background_color">#fafafa</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 807861102..14d619c14 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -157,6 +157,8 @@
     <dimen name="album_padding_left_land">3dp</dimen>
     <dimen name="album_padding_right_land">3dp</dimen>
 
+    <dimen name="photo_view_video_icon_size">48dp</dimen>
+
     <!-- configuration for manage page -->
     <dimen name="cache_pin_size">24dp</dimen>
     <dimen name="cache_pin_margin">8dp</dimen>
@@ -213,6 +215,7 @@
     <dimen name="timeline_port_margin">3dp</dimen>
     <dimen name="timeline_title_height">48dp</dimen>
     <dimen name="timeline_title_font_size">14sp</dimen>
+    <dimen name="timeline_title_margin">16dp</dimen>
 
     <dimen name="timebar_height">60dp</dimen>
     <dimen name="timebar_margin">30dp</dimen>
diff --git a/res/values/filtershow_color.xml b/res/values/filtershow_color.xml
index d6a09a9cf..70a1e7336 100644
--- a/res/values/filtershow_color.xml
+++ b/res/values/filtershow_color.xml
@@ -52,7 +52,7 @@
     <color name="filtershow_image_mask">#4d000000</color>
     <color name="filtershow_info_text">#DE000000</color>
 
-    <color name="filtershow_color_none">#b5b5b5</color>
+    <color name="filtershow_color_none">#5c5c5c</color>
     <color name="filtershow_color_punch">#c6bcc6</color>
     <color name="filtershow_color_vintage">#bb9e61</color>
     <color name="filtershow_color_bw">#000000</color>
diff --git a/res/values/filtershow_values.xml b/res/values/filtershow_values.xml
index c15df9465..046c5440a 100644
--- a/res/values/filtershow_values.xml
+++ b/res/values/filtershow_values.xml
@@ -21,6 +21,9 @@
     <!-- Text size for the state panel -->
     <dimen name="state_panel_text_size">16dip</dimen>
 
+    <!-- Bottom Panel Height -->
+    <dimen name="bottom_panel_height">60dip</dimen>
+
     <!-- Category Panel Height -->
     <dimen name="category_panel_height">90dip</dimen>
 
@@ -35,7 +38,7 @@
     <!-- Category Panel Text Size -->
     <dimen name="category_panel_margin">10dip</dimen>
 
-    <!-- Category Panel height of botton rect -->
+    <!-- Category Panel height of bottom rect -->
     <dimen name="category_panel_bottom_rect_height">20dip</dimen>
 
     <!-- Grad filter dot size -->
@@ -72,7 +75,7 @@
     <dimen name="edge_glow_size">50dip</dimen>
     <dimen name="swap_button_width">168dp</dimen>
     <dimen name="swap_button_height">32dp</dimen>
-    <dimen name="compare_margin_top">104dp</dimen>
+    <dimen name="compare_margin_top">74dp</dimen>
     <dimen name="compare_margin_right">10dp</dimen>
     <dimen name="compare_margin_top_scaled">96dp</dimen>
     <dimen name="compare_margin_right_scaled">60dp</dimen>