Gallery: Modify the layout according to UX design document.

1. Modify toolbar layout according to UX design document.
2. Add touch effect to all buttons if need.
3. Modify video gesture indicator text color.
4. Don't use createChooser if only one app resolve Intent.
5. Modify export dialog layout in Photo Editor.
6. Modify truescanner icon.
7. Modify filter's label color.

Change-Id: I987966ce76e5cab7bc50e5d2e52d1f7b5bdf2113
CRs-Fixed: 1017208

9 files changed, 43 insertions, 76 deletions

diff --git a/res/layout/filtershow_actionbar.xml b/res/layout/filtershow_actionbar.xml
index a23ca80b7..60088e0a1 100644
--- a/res/layout/filtershow_actionbar.xml
+++ b/res/layout/filtershow_actionbar.xml
@@ -15,6 +15,7 @@
      limitations under the License.
 -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:theme="@android:style/Theme.DeviceDefault"
     android:layout_width="match_parent"
     android:layout_height="@dimen/toolbar_height"
     android:orientation="horizontal">
@@ -23,17 +24,18 @@
         android:id="@+id/filtershow_exit"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@android:color/transparent"
+        android:background="?android:attr/actionBarItemBackground"
         android:scaleType="fitCenter"
         android:src="@drawable/cancel"
         android:layout_gravity="left|center_vertical"
-        android:paddingStart="6dp" />
+        android:layout_marginStart="@dimen/toolbar_exit_padding_left" />
 
     <TextView
         android:id="@+id/filtershow_done"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingRight="13dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:layout_marginEnd="13dp"
         android:textSize="17sp"
         android:text="@string/save"
         android:textAllCaps="true"
diff --git a/res/layout/filtershow_actionbar_effects.xml b/res/layout/filtershow_actionbar_effects.xml
index c2b05ebe0..b14a0a766 100644
--- a/res/layout/filtershow_actionbar_effects.xml
+++ b/res/layout/filtershow_actionbar_effects.xml
@@ -29,7 +29,7 @@
         android:layout_height="fill_parent"
         android:layout_gravity="left|center_vertical"
         android:layout_weight=".1"
-        android:background="@android:color/transparent"
+        android:background="?android:attr/actionBarItemBackground"
         android:gravity="center"
         android:src="@drawable/cancel"
         android:paddingStart="16dp"
@@ -63,7 +63,7 @@
         android:layout_height="fill_parent"
         android:layout_gravity="right|center_vertical"
         android:layout_weight=".1"
-        android:background="@android:color/transparent"
+        android:background="?android:attr/actionBarItemBackground"
         android:gravity="center"
         android:src="@drawable/done"
         android:paddingEnd="16dp"
diff --git a/res/layout/filtershow_bottom_panel.xml b/res/layout/filtershow_bottom_panel.xml
index 80efe1a08..81a9d967b 100644
--- a/res/layout/filtershow_bottom_panel.xml
+++ b/res/layout/filtershow_bottom_panel.xml
@@ -29,6 +29,7 @@
 -->
 
 <com.android.gallery3d.filtershow.CenteredLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:theme="@android:style/Theme.DeviceDefault"
     android:id="@+id/bottom_panel"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -47,7 +48,7 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@android:color/transparent"
+            android:background="?android:attr/actionBarItemBackground"
             android:scaleType="centerInside"
             android:src="@drawable/color_background" />
 
@@ -56,7 +57,7 @@
             android:layout_width="@dimen/thumbnail_size"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@android:color/transparent"
+            android:background="?android:attr/actionBarItemBackground"
             android:padding="2dip"
             android:scaleType="centerInside"
             android:src="@drawable/frames_background"
@@ -67,7 +68,7 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@android:color/transparent"
+            android:background="?android:attr/actionBarItemBackground"
             android:padding="2dip"
             android:scaleType="centerInside"
             android:src="@drawable/crop_background" />
@@ -77,7 +78,7 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@android:color/transparent"
+            android:background="?android:attr/actionBarItemBackground"
             android:padding="2dip"
             android:scaleType="centerInside"
             android:src="@drawable/exposure_background" />
@@ -87,7 +88,7 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@android:color/transparent"
+            android:background="?android:attr/actionBarItemBackground"
             android:padding="2dip"
             android:scaleType="centerInside"
             android:src="@drawable/beautify_background"
@@ -98,7 +99,7 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@android:color/transparent"
+            android:background="?android:attr/actionBarItemBackground"
             android:padding="2dip"
             android:scaleType="centerInside"
             android:src="@drawable/dualcamera_background"
@@ -109,17 +110,17 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@android:color/transparent"
+            android:background="?android:attr/actionBarItemBackground"
             android:padding="2dip"
             android:scaleType="centerInside"
-            android:src="@drawable/truescanner" />
+            android:src="@drawable/truescanner_background" />
 
         <ImageButton
             android:id="@+id/hazeBusterButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@android:color/transparent"
+            android:background="?android:attr/actionBarItemBackground"
             android:padding="2dip"
             android:scaleType="centerInside"
             android:src="@drawable/hazebuster" />
@@ -129,7 +130,7 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@android:color/transparent"
+            android:background="?android:attr/actionBarItemBackground"
             android:padding="2dip"
             android:scaleType="centerInside"
             android:src="@drawable/seestraight" />
diff --git a/res/layout/filtershow_category_geometry_panel.xml b/res/layout/filtershow_category_geometry_panel.xml
index e66aa12a4..50515d6ac 100644
--- a/res/layout/filtershow_category_geometry_panel.xml
+++ b/res/layout/filtershow_category_geometry_panel.xml
@@ -29,6 +29,7 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:theme="@android:style/Theme.DeviceDefault"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/transparent"
@@ -54,7 +55,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/crop_icon_size"
                 android:scaleType="centerInside"
-                android:background="@android:color/transparent"
+                android:background="?android:attr/actionBarItemBackground"
                 android:layout_marginTop="@dimen/crop_icon_margin_padding" />
 
             <TextView
@@ -83,7 +84,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/crop_icon_size"
                 android:scaleType="centerInside"
-                android:background="@android:color/transparent"
+                android:background="?android:attr/actionBarItemBackground"
                 android:layout_marginTop="@dimen/crop_icon_margin_padding" />
 
             <TextView
@@ -113,7 +114,7 @@
                 android:layout_height="@dimen/crop_icon_size"
                 android:scaleType="centerInside"
                 android:layout_marginTop="@dimen/crop_icon_margin_padding"
-                android:background="@android:color/transparent" />
+                android:background="?android:attr/actionBarItemBackground" />
 
             <TextView
                 android:id="@+id/rightText"
diff --git a/res/layout/filtershow_export_dialog.xml b/res/layout/filtershow_export_dialog.xml
index 3b41ddaa4..394a89f2e 100644
--- a/res/layout/filtershow_export_dialog.xml
+++ b/res/layout/filtershow_export_dialog.xml
@@ -19,15 +19,12 @@
               android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:divider="?android:dividerVertical"
-              android:showDividers="middle">
+              android:padding="?android:attr/dialogPreferredPadding" >
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal|center_vertical"
-        android:layout_margin="7dp"
-        android:paddingStart="8dp"
         android:textSize="16sp"
         android:textColor="@color/albumset_label_background"
         android:text="@string/select_output_settings"/>
@@ -37,16 +34,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:alignmentMode="alignBounds"
-        android:useDefaultMargins="true"
-        android:layout_marginTop="24dp"
+        android:layout_marginTop="8dp"
         android:columnOrderPreserved="false"
         android:columnCount="5">
 
         <TextView
                 android:text="@string/size"
-                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
                 android:layout_gravity="start|center_vertical"
-                android:paddingStart="8dp"
                 android:textSize="16sp"
                 android:textColor="@color/albumlist_label_title"/>
 
@@ -71,13 +66,13 @@
 
         <TextView
                 android:id="@+id/estimadedSize"
-                android:layout_marginEnd="8dp"
                 android:layout_gravity="end|center_vertical"
                 android:textSize="16sp"
                 android:textColor="@color/albumlist_label_title"/>
 
         <LinearLayout
                 android:layout_columnSpan="5"
+                android:layout_marginTop="16dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -85,13 +80,11 @@
                 android:text="@string/quality"
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
-                android:layout_margin="8dp"
                 android:textSize="16sp"
                 android:textColor="@color/albumlist_label_title" />
 
             <SeekBar
                 android:id="@+id/qualitySeekBar"
-                android:layout_margin="8dp"
                 android:layout_gravity="center"
                 android:max="100"
                 android:progress="100"
@@ -105,43 +98,9 @@
                 android:id="@+id/qualityTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="8dp"
                 android:textSize="16sp"
                 android:textColor="@color/albumlist_label_title"
-                android:layout_gravity="end|center_vertical"
-                />
-
+                android:layout_gravity="end|center_vertical" />
         </LinearLayout>
-
-
     </GridLayout>
-
-    <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            style="?android:attr/buttonBarStyle"
-            android:gravity="right">
-
-        <Button
-                android:id="@+id/cancel"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:text="@string/cancel"
-                android:textSize="14sp"
-                android:layout_marginRight="8dp"
-                style="?android:attr/buttonBarButtonStyle"
-                android:textColor="#009688"/>
-
-        <Button
-                android:id="@+id/done"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:textSize="14sp"
-                android:text="@string/done"
-                style="?android:attr/buttonBarButtonStyle"
-                android:textColor="#009688"/>
-
-    </LinearLayout>
-
 </LinearLayout>
diff --git a/res/layout/filtershow_seekbar.xml b/res/layout/filtershow_seekbar.xml
index 216b72a9c..8cb5cd979 100644
--- a/res/layout/filtershow_seekbar.xml
+++ b/res/layout/filtershow_seekbar.xml
@@ -16,6 +16,7 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:theme="@android:style/Theme.DeviceDefault"
     android:id="@+id/top"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -28,7 +29,7 @@
         android:layout_height="60dp"
         android:src="@drawable/cancel"
         android:layout_gravity="center_vertical"
-        android:background="@android:color/transparent" />
+        android:background="?android:attr/actionBarItemBackground" />
 
     <SeekBar
         android:id="@+id/primarySeekBar"
@@ -47,6 +48,6 @@
         android:layout_height="60dp"
         android:src="@drawable/done"
         android:layout_gravity="center_vertical"
-        android:background="@android:color/transparent" />
+        android:background="?android:attr/actionBarItemBackground" />
 
 </LinearLayout>
diff --git a/res/layout/photopage_bottom_controls.xml b/res/layout/photopage_bottom_controls.xml
index f52a704a7..cd8e8a7d2 100644
--- a/res/layout/photopage_bottom_controls.xml
+++ b/res/layout/photopage_bottom_controls.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/photopage_bottom_controls"
+    android:theme="@android:style/Theme.DeviceDefault"
     android:layout_width="match_parent"
     android:layout_height="56dp"
     android:layout_alignParentBottom="true"
@@ -13,30 +14,30 @@
     <ImageButton
         android:id="@+id/photopage_bottom_control_edit"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
         android:layout_weight="1"
-        android:background="@null"
+        android:background="?android:attr/actionBarItemBackground"
         android:src="@drawable/edit"
         android:visibility="gone" />
 
     <ImageButton
         android:id="@+id/photopage_bottom_control_share"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
         android:layout_weight="1"
-        android:background="@null"
+        android:background="?android:attr/actionBarItemBackground"
         android:src="@drawable/share"
         android:visibility="gone" />
 
     <ImageButton
         android:id="@+id/photopage_bottom_control_delete"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
         android:layout_weight="1"
-        android:background="@null"
+        android:background="?android:attr/actionBarItemBackground"
         android:src="@drawable/delete"
         android:visibility="gone" />
 
diff --git a/res/layout/toolbar.xml b/res/layout/toolbar.xml
index 5616f1fcb..054d97c84 100644
--- a/res/layout/toolbar.xml
+++ b/res/layout/toolbar.xml
@@ -31,8 +31,8 @@
 <Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="@dimen/toolbar_height"
-    android:paddingTop="30dp"
-    android:background="#e53935"
+    android:paddingTop="26dp"
+    android:background="@color/toolbar_theme"
     android:elevation="4dp"
     android:theme="@style/ToolbarTheme"
     android:titleTextAppearance="@style/ToolbarTitleStyle"
diff --git a/res/layout/trim_menu.xml b/res/layout/trim_menu.xml
index 164264546..79a0f8808 100644
--- a/res/layout/trim_menu.xml
+++ b/res/layout/trim_menu.xml
@@ -20,17 +20,19 @@
         android:layout_centerVertical="true">
     <ImageView
         android:id="@+id/exit_trim"
+        android:background="?android:attr/actionBarItemBackground"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:src="@drawable/cancel"/>
     <TextView
         android:id="@+id/start_trim"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
         android:layout_marginStart="8dp"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:text="@string/save"
         android:textAllCaps="true"
-        android:layout_gravity="right"
+        android:layout_gravity="end|center_vertical"
         android:textSize="16sp"
         android:textColor="@color/primary_text"
         android:gravity="left|center_vertical"