Merge "Gallery2: revert filtershow panel layout to M style;" into android_ui.lnx.1.2-dev

4 files changed, 46 insertions, 314 deletions

diff --git a/res/drawable/comparison_before.xml b/res/drawable/comparison_before.xml
index b846e03aa..9dd01fc9f 100644
--- a/res/drawable/comparison_before.xml
+++ b/res/drawable/comparison_before.xml
@@ -34,8 +34,8 @@
         android:viewportHeight="36.0">
     <path
         android:pathData="M18,1c9.389,0 17,7.611 17,17c0,9.388 -7.611,17 -17,17C8.612,35 1,27.388 1,18C1,8.611 8.612,1 18,1z"
-        android:fillAlpha="0.26"
-        android:fillColor="#FFFFFF"/>
+        android:fillAlpha="0.50"
+        android:fillColor="#000000"/>
     <path
         android:pathData="M9.258,16h1.333v-1.333H9.258V16zM10.591,23.999v-1.333H9.258C9.258,23.402 9.854,23.999 10.591,23.999zM9.258,13.334h1.333v-1.333C9.854,12.001 9.258,12.598 9.258,13.334zM9.258,21.333h1.333V20H9.258V21.333zM9.258,18.667h1.333v-1.334H9.258V18.667zM14.667,23.999H16v-1.333h-1.333V23.999zM25.408,12.001h-5.37v1.333h5.37v9.332h-5.37v1.333h5.37c0.737,0 1.334,-0.597 1.334,-1.333v-9.332C26.742,12.598 26.146,12.001 25.408,12.001zM17.334,25.332h1.333V10.667h-1.333V25.332zM15.97,12.001h-1.333v1.333h1.333V12.001zM11.955,13.334h1.334v-1.333h-1.334V13.334zM11.955,23.999h1.334v-1.333h-1.334V23.999z"
         android:fillColor="#FFFFFF"/>
diff --git a/res/layout-land/filtershow_main_panel.xml b/res/layout-land/filtershow_main_panel.xml
deleted file mode 100644
index 2d20df12e..000000000
--- a/res/layout-land/filtershow_main_panel.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="80dp"
-    android:animateLayoutChanges="true"
-    android:baselineAligned="false"
-    android:orientation="vertical"
-    android:visibility="visible" >
-
-
-    <com.android.gallery3d.filtershow.CenteredLinearLayout
-        xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center|bottom"
-        android:orientation="vertical"
-        android:background="@color/edit_actionbar_background"
-        custom:max_width="400dip" >
-
-        <FrameLayout
-            android:id="@+id/category_panel_container"
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1"
-            android:visibility="gone" />
-
-        <LinearLayout
-            android:id="@+id/effectsContainer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingTop="10dp" >
-
-            <ImageButton
-                android:id="@+id/fxButton"
-                android:layout_width="@dimen/thumbnail_size"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@android:color/transparent"
-                android:scaleType="centerInside"
-                android:src="@drawable/color" />
-
-            <ImageButton
-                android:id="@+id/borderButton"
-                android:layout_width="@dimen/thumbnail_size"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@android:color/transparent"
-                android:padding="2dip"
-                android:scaleType="centerInside"
-                android:src="@drawable/frames" />
-
-            <ImageButton
-                android:id="@+id/geometryButton"
-                android:layout_width="@dimen/thumbnail_size"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@android:color/transparent"
-                android:padding="2dip"
-                android:scaleType="centerInside"
-                android:src="@drawable/crop" />
-
-            <ImageButton
-                android:id="@+id/colorsButton"
-                android:layout_width="@dimen/thumbnail_size"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@android:color/transparent"
-                android:padding="2dip"
-                android:scaleType="centerInside"
-                android:src="@drawable/exposure" />
-
-            <ImageButton
-                android:id="@+id/makeupButton"
-                android:layout_width="@dimen/thumbnail_size"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@android:color/transparent"
-                android:padding="2dip"
-                android:scaleType="centerInside"
-                android:src="@drawable/beautify"
-                android:visibility="gone" />
-            <ImageButton
-                    android:id="@+id/dualCamButton"
-                    android:layout_width="@dimen/thumbnail_size"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@android:color/transparent"
-                    android:padding="2dip"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/dualcamera"/>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/effectsText"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:paddingTop="5dp" >
-
-            <TextView
-                android:id="@+id/tvColor"
-                android:layout_width="@dimen/thumbnail_size"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:text="@string/color"
-                android:textColor="#ffffff"
-                android:gravity="center"
-                android:textSize="@dimen/edit_main_font" />
-
-            <TextView
-                android:id="@+id/tvFrames"
-                android:layout_width="@dimen/thumbnail_size"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:text="@string/frames"
-                android:textColor="#ffffff"
-                android:gravity="center"
-                android:textSize="@dimen/edit_main_font" />
-
-            <TextView
-                android:id="@+id/tvCrop"
-                android:layout_width="@dimen/thumbnail_size"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:paddingLeft="12dp"
-                android:text="@string/crop"
-                android:textColor="#ffffff"
-                android:gravity="center"
-                android:textSize="@dimen/edit_main_font" />
-
-            <TextView
-                android:id="@+id/tvExposure"
-                android:layout_width="@dimen/thumbnail_size"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:text="@string/exposure"
-                android:textColor="#ffffff"
-                android:gravity="center"
-                android:textSize="@dimen/edit_main_font" />
-
-            <TextView
-                android:id="@+id/tvBeautify"
-                android:layout_width="@dimen/thumbnail_size"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:text="@string/beautify"
-                android:textColor="#ffffff"
-                android:gravity="center"
-                android:textSize="@dimen/edit_main_font"
-                android:visibility="gone" />
-
-            <TextView
-                android:id="@+id/tvDualCam"
-                android:layout_width="@dimen/thumbnail_size"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/dualcam"
-                android:gravity="center"
-                android:textColor="#ffffff"
-                android:textSize="@dimen/edit_main_font"
-                android:visibility="gone" />
-        </LinearLayout>
-    </com.android.gallery3d.filtershow.CenteredLinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index d89f6b264..4663ce517 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -19,7 +19,7 @@
     android:id="@+id/mainView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#212121" >
+    android:background="@color/background_screen" >
 
         <FrameLayout
             android:layout_width="match_parent"
@@ -62,7 +62,7 @@
                 xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
                 android:id="@+id/mainPanel"
                 android:layout_width="match_parent"
-                android:layout_height="80dp"
+                android:layout_height="wrap_content"
                 android:layout_gravity="center|bottom"
                 android:orientation="vertical"
                 custom:max_width="650dip" >
diff --git a/res/layout/filtershow_main_panel.xml b/res/layout/filtershow_main_panel.xml
index 00d63c154..bc42be25b 100644
--- a/res/layout/filtershow_main_panel.xml
+++ b/res/layout/filtershow_main_panel.xml
@@ -20,51 +20,63 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="80dp"
+    android:layout_height="wrap_content"
     android:animateLayoutChanges="false"
     android:baselineAligned="false"
     android:orientation="vertical"
-    android:visibility="visible" >
+    android:visibility="visible"
+    android:background="@color/background_main_toolbar" >
+
+    <FrameLayout android:id="@+id/state_panel_container"
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                 android:visibility="visible"
+                 android:layout_gravity="top"
+                 android:layout_weight="1" />
+
+    <FrameLayout android:id="@+id/category_panel_container"
+                 android:layout_width="match_parent"
+                 android:visibility="visible"
+                 android:layout_height="0dip"
+                 android:layout_gravity="center"
+                 android:layout_weight="1"/>
+
+    <View
+            android:background="@color/toolbar_separation_line"
+            android:layout_height="1dip"
+            android:layout_width="match_parent"/>
 
     <com.android.gallery3d.filtershow.CenteredLinearLayout
         xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
         android:id="@+id/bottom_panel"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="48dip"
         android:layout_gravity="center|bottom"
-        android:background="@color/edit_actionbar_background"
         android:orientation="vertical"
         custom:max_width="400dip" >
 
-        <FrameLayout
-            android:id="@+id/category_panel_container"
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:visibility="gone" />
-
         <LinearLayout
             android:id="@+id/effectsContainer"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
+            android:background="@color/background_main_toolbar"
             android:paddingTop="10dp" >
 
             <ImageButton
                 android:id="@+id/fxButton"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@android:color/transparent"
+                android:background="@drawable/filtershow_button_background"
                 android:scaleType="centerInside"
                 android:src="@drawable/color" />
 
             <ImageButton
                 android:id="@+id/borderButton"
                 android:layout_width="@dimen/thumbnail_size"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@android:color/transparent"
+                android:background="@drawable/filtershow_button_background"
                 android:padding="2dip"
                 android:scaleType="centerInside"
                 android:visibility="gone"
@@ -73,9 +85,9 @@
             <ImageButton
                 android:id="@+id/geometryButton"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@android:color/transparent"
+                android:background="@drawable/filtershow_button_background"
                 android:padding="2dip"
                 android:scaleType="centerInside"
                 android:src="@drawable/crop" />
@@ -83,19 +95,19 @@
             <ImageButton
                 android:id="@+id/colorsButton"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@android:color/transparent"
+                android:background="@drawable/filtershow_button_background"
                 android:padding="2dip"
                 android:scaleType="centerInside"
                 android:src="@drawable/exposure" />
 
             <ImageButton
                 android:id="@+id/makeupButton"
-                android:layout_width="@dimen/thumbnail_size"
-                android:layout_height="wrap_content"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@android:color/transparent"
+                android:background="@drawable/filtershow_button_background"
                 android:padding="2dip"
                 android:scaleType="centerInside"
                 android:src="@drawable/beautify"
@@ -103,10 +115,10 @@
 
            <ImageButton
                     android:id="@+id/dualCamButton"
-                    android:layout_width="@dimen/thumbnail_size"
-                    android:layout_height="wrap_content"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:background="@android:color/transparent"
+                    android:background="@drawable/filtershow_button_background"
                     android:padding="2dip"
                     android:scaleType="centerInside"
                     android:visibility="gone"
@@ -114,7 +126,7 @@
 
            <ImageButton
                 android:id="@+id/trueScannerButton"
-                android:layout_width="@dimen/thumbnail_size"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:background="@android:color/transparent"
@@ -124,7 +136,7 @@
 
            <ImageButton
                 android:id="@+id/hazeBusterButton"
-                android:layout_width="@dimen/thumbnail_size"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:background="@android:color/transparent"
@@ -134,7 +146,7 @@
 
             <ImageButton
                 android:id="@+id/seeStraightButton"
-                android:layout_width="@dimen/thumbnail_size"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:background="@drawable/filtershow_button_background"
@@ -142,105 +154,5 @@
                 android:scaleType="centerInside"
                 android:src="@drawable/seestraight"/>
         </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/effectsText"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:paddingTop="5dp" >
-
-            <TextView
-                android:id="@+id/tvColor"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/color"
-                android:textColor="#ffffff"
-                android:gravity="center"
-                android:textSize="@dimen/edit_main_font" />
-
-            <TextView
-                android:id="@+id/tvFrames"
-                android:layout_width="@dimen/thumbnail_size"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/frames"
-                android:textColor="#ffffff"
-                android:gravity="center"
-                android:visibility="gone"
-                android:textSize="@dimen/edit_main_font" />
-
-            <TextView
-                android:id="@+id/tvCrop"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/crop"
-                android:textColor="#ffffff"
-                android:gravity="center"
-                android:textSize="@dimen/edit_main_font" />
-
-            <TextView
-                android:id="@+id/tvExposure"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/exposure"
-                android:gravity="center"
-                android:textColor="#ffffff"
-                android:textSize="@dimen/edit_main_font" />
-
-            <TextView
-                android:id="@+id/tvBeautify"
-                android:layout_width="@dimen/thumbnail_size"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/beautify"
-                android:textColor="#ffffff"
-                android:gravity="center"
-                android:textSize="@dimen/edit_main_font"
-                android:visibility="gone" />
-
-             <TextView
-                android:id="@+id/tvDualCam"
-                android:layout_width="@dimen/thumbnail_size"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/dualcam"
-                android:gravity="center"
-                android:textColor="#ffffff"
-                android:textSize="@dimen/edit_main_font"
-                android:visibility="gone" />
-
-            <TextView
-                android:id="@+id/tvTrueScanner"
-                android:layout_width="@dimen/thumbnail_size"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/trueScanner"
-                android:gravity="center"
-                android:textColor="#ffffff"
-                android:textSize="@dimen/edit_main_font" />
-
-            <TextView
-                android:id="@+id/tvHazeBuster"
-                android:layout_width="@dimen/thumbnail_size"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/hazeBuster"
-                android:gravity="center"
-                android:textColor="#ffffff"
-                android:textSize="@dimen/edit_main_font" />
-
-            <TextView
-                android:id="@+id/tvSeeStraight"
-                android:layout_width="@dimen/thumbnail_size"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/seeStraight"
-                android:gravity="center"
-                android:textColor="#ffffff"
-                android:textSize="@dimen/edit_main_font" />
-        </LinearLayout>
     </com.android.gallery3d.filtershow.CenteredLinearLayout>
 </LinearLayout>