From 80516cafe6b434a61ad0b115e84fe8e536148701 Mon Sep 17 00:00:00 2001
From: Chao Zhang <chaoz@codeaurora.org>
Date: Mon, 25 Apr 2016 15:37:33 +0800
Subject: Gallery2: Show seekbar under category panel according to UI design.

1. Show seekbar under category panel according to UI design.
2. No need animation if return from seek bar's "cancel" and "save".

Change-Id: I63d8454137c1c87862c9fb5a52d322edc81ccff3
CRs-Fixed: 1007612
---
 res/layout/filtershow_bottom_panel.xml | 137 +++++++++++++++++++++++++++++++++
 res/layout/filtershow_editor_panel.xml |   2 +-
 res/layout/filtershow_main_panel.xml   | 112 ++-------------------------
 res/layout/filtershow_seekbar.xml      |   4 +-
 4 files changed, 145 insertions(+), 110 deletions(-)
 create mode 100644 res/layout/filtershow_bottom_panel.xml

(limited to 'res/layout')

diff --git a/res/layout/filtershow_bottom_panel.xml b/res/layout/filtershow_bottom_panel.xml
new file mode 100644
index 000000000..abefcba39
--- /dev/null
+++ b/res/layout/filtershow_bottom_panel.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above
+        copyright notice, this list of conditions and the following
+        disclaimer in the documentation and/or other materials provided
+        with the distribution.
+      * Neither the name of The Linux Foundation nor the names of its
+        contributors may be used to endorse or promote products derived
+        from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<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_gravity="center|bottom"
+    android:background="@color/bottom_panel_background_color"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/effectsContainer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        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="@android:color/transparent"
+            android:scaleType="centerInside"
+            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="@android:color/transparent"
+            android:padding="2dip"
+            android:scaleType="centerInside"
+            android:src="@drawable/frames_background"
+            android:visibility="gone" />
+
+        <ImageButton
+            android:id="@+id/geometryButton"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@android:color/transparent"
+            android:padding="2dip"
+            android:scaleType="centerInside"
+            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="@android:color/transparent"
+            android:padding="2dip"
+            android:scaleType="centerInside"
+            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="@android:color/transparent"
+            android:padding="2dip"
+            android:scaleType="centerInside"
+            android:src="@drawable/beautify_background"
+            android:visibility="gone" />
+
+        <ImageButton
+            android:id="@+id/dualCamButton"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@android:color/transparent"
+            android:padding="2dip"
+            android:scaleType="centerInside"
+            android:src="@drawable/dualcamera_background"
+            android:visibility="gone" />
+
+        <ImageButton
+            android:id="@+id/trueScannerButton"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@android:color/transparent"
+            android:padding="2dip"
+            android:scaleType="centerInside"
+            android:src="@drawable/truescanner" />
+
+        <ImageButton
+            android:id="@+id/hazeBusterButton"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@android:color/transparent"
+            android:padding="2dip"
+            android:scaleType="centerInside"
+            android:src="@drawable/hazebuster" />
+
+        <ImageButton
+            android:id="@+id/seeStraightButton"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@android:color/transparent"
+            android:padding="2dip"
+            android:scaleType="centerInside"
+            android:src="@drawable/seestraight" />
+    </LinearLayout>
+</com.android.gallery3d.filtershow.CenteredLinearLayout>
\ No newline at end of file
diff --git a/res/layout/filtershow_editor_panel.xml b/res/layout/filtershow_editor_panel.xml
index b7ec266f2..39770c6e8 100644
--- a/res/layout/filtershow_editor_panel.xml
+++ b/res/layout/filtershow_editor_panel.xml
@@ -20,6 +20,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:background="@color/bottom_panel_background_color"
     android:visibility="visible" >
 
     <Button
@@ -46,7 +47,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_alignParentBottom="true"
-            android:background="#000000"
             android:orientation="horizontal"
             android:gravity="center"
             android:visibility="visible" >
diff --git a/res/layout/filtershow_main_panel.xml b/res/layout/filtershow_main_panel.xml
index 7046f3089..b9b18a036 100644
--- a/res/layout/filtershow_main_panel.xml
+++ b/res/layout/filtershow_main_panel.xml
@@ -44,112 +44,10 @@
                  android:background="@color/crop_panel_background_color"
                  android:layout_weight="1"/>
 
-    <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="48dip"
-        android:layout_gravity="center|bottom"
-        android:orientation="vertical"
-        android:background="@color/crop_panel_background_color" >
-
-        <LinearLayout
-            android:id="@+id/effectsContainer"
+    <FrameLayout
+            android:id="@+id/bottom_panel_container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            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="@android:color/transparent"
-                android:scaleType="centerInside"
-                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="@android:color/transparent"
-                android:padding="2dip"
-                android:scaleType="centerInside"
-                android:visibility="gone"
-                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="@android:color/transparent"
-                android:padding="2dip"
-                android:scaleType="centerInside"
-                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="@android:color/transparent"
-                android:padding="2dip"
-                android:scaleType="centerInside"
-                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="@android:color/transparent"
-                android:padding="2dip"
-                android:scaleType="centerInside"
-                android:src="@drawable/beautify_background"
-                android:visibility="gone" />
-
-           <ImageButton
-                    android:id="@+id/dualCamButton"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@android:color/transparent"
-                    android:padding="2dip"
-                    android:scaleType="centerInside"
-                    android:visibility="gone"
-                    android:src="@drawable/dualcamera_background"/>
-
-           <ImageButton
-                android:id="@+id/trueScannerButton"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@android:color/transparent"
-                android:padding="2dip"
-                android:scaleType="centerInside"
-                android:src="@drawable/truescanner"/>
-
-           <ImageButton
-                android:id="@+id/hazeBusterButton"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@android:color/transparent"
-                android:padding="2dip"
-                android:scaleType="centerInside"
-                android:src="@drawable/hazebuster"/>
-
-            <ImageButton
-                android:id="@+id/seeStraightButton"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@android:color/transparent"
-                android:padding="2dip"
-                android:scaleType="centerInside"
-                android:src="@drawable/seestraight"/>
-        </LinearLayout>
-    </com.android.gallery3d.filtershow.CenteredLinearLayout>
+            android:layout_height="48dip"
+            android:visibility="visible"
+            android:layout_gravity="center"/>
 </LinearLayout>
diff --git a/res/layout/filtershow_seekbar.xml b/res/layout/filtershow_seekbar.xml
index 5b884ae49..216b72a9c 100644
--- a/res/layout/filtershow_seekbar.xml
+++ b/res/layout/filtershow_seekbar.xml
@@ -28,7 +28,7 @@
         android:layout_height="60dp"
         android:src="@drawable/cancel"
         android:layout_gravity="center_vertical"
-        android:background="#000000" />
+        android:background="@android:color/transparent" />
 
     <SeekBar
         android:id="@+id/primarySeekBar"
@@ -47,6 +47,6 @@
         android:layout_height="60dp"
         android:src="@drawable/done"
         android:layout_gravity="center_vertical"
-        android:background="#000000" />
+        android:background="@android:color/transparent" />
 
 </LinearLayout>
-- 
cgit v1.2.3