From 4c8c153f5b4a82ca44297a47301c30ac1ad3d810 Mon Sep 17 00:00:00 2001
From: Chao Zhang <chaoz@codeaurora.org>
Date: Tue, 3 May 2016 12:46:49 +0800
Subject: 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
---
 res/layout/action_mode.xml               | 11 +++--------
 res/layout/filtershow_activity.xml       |  4 ++--
 res/layout/filtershow_bottom_panel.xml   |  2 +-
 res/layout/filtershow_main_panel.xml     |  2 +-
 res/layout/photopage_bottom_controls.xml |  2 +-
 5 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'res/layout')

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