Gallery2: Modified layout of main panel in photo editor interface.

1. Change shape of iconview to square.
2. Add label on the bottom of iconview.
3. Change main panel background to transparent.
4. Change pictures of bottom icons in main panel.
5. Remove preset item if it has for each model filter.
according to UX specification document.

Change-Id: I81034c2e26e5ff1844826f0810bb91bbbaceb1ad
CRs-Fixed: 988070 988051

3 files changed, 28 insertions, 27 deletions

diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 4663ce517..56666ece3 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -64,6 +64,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center|bottom"
+                android:background="@android:color/transparent"
                 android:orientation="vertical"
                 custom:max_width="650dip" >
 
@@ -71,6 +72,7 @@
                     android:id="@+id/main_panel_container"
                     android:layout_width="match_parent"
                     android:layout_height="0dip"
+                    android:background="@android:color/transparent"
                     android:layout_gravity="center"
                     android:layout_weight="1" />
             </com.android.gallery3d.filtershow.CenteredLinearLayout>
diff --git a/res/layout/filtershow_category_panel_new.xml b/res/layout/filtershow_category_panel_new.xml
index 51439f011..58d45272e 100644
--- a/res/layout/filtershow_category_panel_new.xml
+++ b/res/layout/filtershow_category_panel_new.xml
@@ -20,18 +20,20 @@
               android:orientation="horizontal"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:background="@color/edit_actionbar_background">
+              android:background="@android:color/transparent">
 
     <HorizontalScrollView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:background="@android:color/transparent"
             android:scrollbars="none" >
 
         <com.android.gallery3d.filtershow.category.CategoryTrack
                 android:id="@+id/listItems"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/category_panel_height"
+                android:background="@android:color/transparent"
                 custom:iconSize="@dimen/category_panel_icon_size"
                 android:divider="@android:color/transparent"
                 android:dividerPadding="8dip"
diff --git a/res/layout/filtershow_main_panel.xml b/res/layout/filtershow_main_panel.xml
index bc42be25b..7046f3089 100644
--- a/res/layout/filtershow_main_panel.xml
+++ b/res/layout/filtershow_main_panel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (c) 2015, The Linux Foundation. All rights reserved.
+     Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
      Not a Contribution
 
      Copyright (C) 2013 The Android Open Source Project
@@ -25,7 +25,7 @@
     android:baselineAligned="false"
     android:orientation="vertical"
     android:visibility="visible"
-    android:background="@color/background_main_toolbar" >
+    android:background="@android:color/transparent" >
 
     <FrameLayout android:id="@+id/state_panel_container"
                  android:layout_width="match_parent"
@@ -39,13 +39,11 @@
                  android:visibility="visible"
                  android:layout_height="0dip"
                  android:layout_gravity="center"
+                 android:paddingRight="5dp"
+                 android:paddingLeft="5dp"
+                 android:background="@color/crop_panel_background_color"
                  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"
@@ -53,64 +51,63 @@
         android:layout_height="48dip"
         android:layout_gravity="center|bottom"
         android:orientation="vertical"
-        custom:max_width="400dip" >
+        android:background="@color/crop_panel_background_color" >
 
         <LinearLayout
             android:id="@+id/effectsContainer"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/background_main_toolbar"
-            android:paddingTop="10dp" >
+            android:background="@android:color/transparent" >
 
             <ImageButton
                 android:id="@+id/fxButton"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/filtershow_button_background"
+                android:background="@android:color/transparent"
                 android:scaleType="centerInside"
-                android:src="@drawable/color" />
+                android:src="@drawable/color_background" />
 
             <ImageButton
                 android:id="@+id/borderButton"
                 android:layout_width="@dimen/thumbnail_size"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/filtershow_button_background"
+                android:background="@android:color/transparent"
                 android:padding="2dip"
                 android:scaleType="centerInside"
                 android:visibility="gone"
-                android:src="@drawable/frames" />
+                android:src="@drawable/frames_background" />
 
             <ImageButton
                 android:id="@+id/geometryButton"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/filtershow_button_background"
+                android:background="@android:color/transparent"
                 android:padding="2dip"
                 android:scaleType="centerInside"
-                android:src="@drawable/crop" />
+                android:src="@drawable/crop_background" />
 
             <ImageButton
                 android:id="@+id/colorsButton"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/filtershow_button_background"
+                android:background="@android:color/transparent"
                 android:padding="2dip"
                 android:scaleType="centerInside"
-                android:src="@drawable/exposure" />
+                android:src="@drawable/exposure_background" />
 
             <ImageButton
                 android:id="@+id/makeupButton"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/filtershow_button_background"
+                android:background="@android:color/transparent"
                 android:padding="2dip"
                 android:scaleType="centerInside"
-                android:src="@drawable/beautify"
+                android:src="@drawable/beautify_background"
                 android:visibility="gone" />
 
            <ImageButton
@@ -118,16 +115,16 @@
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:background="@drawable/filtershow_button_background"
+                    android:background="@android:color/transparent"
                     android:padding="2dip"
                     android:scaleType="centerInside"
                     android:visibility="gone"
-                    android:src="@drawable/dualcamera"/>
+                    android:src="@drawable/dualcamera_background"/>
 
            <ImageButton
                 android:id="@+id/trueScannerButton"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@android:color/transparent"
                 android:padding="2dip"
@@ -137,7 +134,7 @@
            <ImageButton
                 android:id="@+id/hazeBusterButton"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@android:color/transparent"
                 android:padding="2dip"
@@ -147,9 +144,9 @@
             <ImageButton
                 android:id="@+id/seeStraightButton"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/filtershow_button_background"
+                android:background="@android:color/transparent"
                 android:padding="2dip"
                 android:scaleType="centerInside"
                 android:src="@drawable/seestraight"/>