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

2 files changed, 44 insertions, 132 deletions

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>