Fix spacing in saturation panel

Change-Id: I405874cd7c5cf2d6a203125bc4ea978f0e49be38

2 files changed, 48 insertions, 24 deletions

diff --git a/res/layout-land/filtershow_saturation_controls.xml b/res/layout-land/filtershow_saturation_controls.xml
index 42c9dc094..f452a6487 100644
--- a/res/layout-land/filtershow_saturation_controls.xml
+++ b/res/layout-land/filtershow_saturation_controls.xml
@@ -3,13 +3,13 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:orientation="vertical"
               android:layout_width="match_parent"
-              android:layout_height="0dp"
-              android:layout_weight="1">
+              android:layout_height="match_parent">
 
     <ScrollView
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1">
+            android:layout_weight="1"
+            android:fadeScrollbars="false">
 
         <GridLayout
                 android:orientation="horizontal"
@@ -22,27 +22,14 @@
 
             <TextView
                     android:layout_gravity="left|center_vertical"
-                    android:text="@string/editor_chan_sat_main"
-                    android:layout_marginLeft="8dp"/>
-            <TextView
-                    android:layout_gravity="right|center_vertical"
-                    android:id="@+id/mainValue"
-                    android:layout_marginRight="8dp"/>
-            <SeekBar
-                    android:id="@+id/mainSeekbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/FilterShowSlider"
-                    android:layout_columnSpan="2"/>
-
-            <TextView
-                    android:layout_gravity="left|center_vertical"
                     android:text="@string/editor_chan_sat_red"
+                    android:textStyle="bold"
+                    android:textColor="#ff8080"
                     android:layout_marginLeft="8dp"/>
             <TextView
                     android:layout_gravity="right|center_vertical"
                     android:id="@+id/redValue"
-                    android:layout_marginRight="8dp"/>
+                    android:layout_marginRight="16dp"/>
             <SeekBar
                     android:id="@+id/redSeekBar"
                     android:layout_width="match_parent"
@@ -53,11 +40,13 @@
             <TextView
                     android:layout_gravity="left|center_vertical"
                     android:text="@string/editor_chan_sat_yellow"
+                    android:textStyle="bold"
+                    android:textColor="#ffff80"
                     android:layout_marginLeft="8dp"/>
             <TextView
                     android:layout_gravity="right|center_vertical"
                     android:id="@+id/yellowValue"
-                    android:layout_marginRight="8dp"/>
+                    android:layout_marginRight="16dp"/>
             <SeekBar
                     android:id="@+id/yellowSeekBar"
                     android:layout_width="match_parent"
@@ -68,11 +57,13 @@
             <TextView
                     android:layout_gravity="left|center_vertical"
                     android:text="@string/editor_chan_sat_green"
+                    android:textStyle="bold"
+                    android:textColor="#80ff80"
                     android:layout_marginLeft="8dp"/>
             <TextView
                     android:layout_gravity="right|center_vertical"
                     android:id="@+id/greenValue"
-                    android:layout_marginRight="8dp"/>
+                    android:layout_marginRight="16dp"/>
             <SeekBar
                     android:id="@+id/greenSeekBar"
                     android:layout_width="match_parent"
@@ -83,11 +74,13 @@
             <TextView
                     android:layout_gravity="left|center_vertical"
                     android:text="@string/editor_chan_sat_cyan"
+                    android:textStyle="bold"
+                    android:textColor="#80ffff"
                     android:layout_marginLeft="8dp"/>
             <TextView
                     android:layout_gravity="right|center_vertical"
                     android:id="@+id/cyanValue"
-                    android:layout_marginRight="8dp"/>
+                    android:layout_marginRight="16dp"/>
             <SeekBar
                     android:id="@+id/cyanSeekBar"
                     android:layout_width="match_parent"
@@ -98,11 +91,13 @@
             <TextView
                     android:layout_gravity="left|center_vertical"
                     android:text="@string/editor_chan_sat_blue"
+                    android:textStyle="bold"
+                    android:textColor="#8080ff"
                     android:layout_marginLeft="8dp"/>
             <TextView
                     android:layout_gravity="right|center_vertical"
                     android:id="@+id/blueValue"
-                    android:layout_marginRight="8dp"/>
+                    android:layout_marginRight="16dp"/>
             <SeekBar
                     android:id="@+id/blueSeekBar"
                     android:layout_width="match_parent"
@@ -113,11 +108,13 @@
             <TextView
                     android:layout_gravity="left|center_vertical"
                     android:text="@string/editor_chan_sat_magenta"
+                    android:textStyle="bold"
+                    android:textColor="#ff80ff"
                     android:layout_marginLeft="8dp"/>
             <TextView
                     android:layout_gravity="right|center_vertical"
                     android:id="@+id/magentaValue"
-                    android:layout_marginRight="8dp"/>
+                    android:layout_marginRight="16dp"/>
             <SeekBar
                     android:id="@+id/magentaSeekBar"
                     android:layout_width="match_parent"
@@ -127,4 +124,30 @@
         </GridLayout>
     </ScrollView>
 
+    <GridLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="128dp"
+            android:alignmentMode="alignBounds"
+            android:useDefaultMargins="true"
+            android:columnOrderPreserved="false"
+            android:layout_weight="1"
+            android:columnCount="2">
+
+        <TextView
+                android:layout_gravity="left|center_vertical"
+                android:text="@string/editor_chan_sat_main"
+                android:layout_marginLeft="8dp"/>
+        <TextView
+                android:layout_gravity="right|center_vertical"
+                android:id="@+id/mainValue"
+                android:layout_marginRight="16dp"/>
+        <SeekBar
+                android:id="@+id/mainSeekbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/FilterShowSlider"
+                android:layout_columnSpan="2"/>
+    </GridLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterChanSatRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterChanSatRepresentation.java
index 7ce67dd96..6c5274da1 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterChanSatRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterChanSatRepresentation.java
@@ -73,6 +73,7 @@ public class FilterChanSatRepresentation extends FilterRepresentation implements
         setSerializationName(SERIALIZATION_NAME);
         setFilterClass(ImageFilterChanSat.class);
         setEditorId(EditorChanSat.ID);
+        setSupportsPartialRendering(true);
     }
 
     public String toString() {