am dc31fa13: am 59d0ef1e: am 2e1bc2e3: Fix UI Tablet for saturation panel

* commit 'dc31fa1390a18192287d9a5998c894386b05d997':
  Fix UI Tablet for saturation panel

2 files changed, 164 insertions, 36 deletions

diff --git a/res/layout-land/filtershow_editor_panel.xml b/res/layout-land/filtershow_editor_panel.xml
index 2cb00e3b9..fc3246826 100644
--- a/res/layout-land/filtershow_editor_panel.xml
+++ b/res/layout-land/filtershow_editor_panel.xml
@@ -22,51 +22,30 @@
               android:orientation="vertical"
               android:visibility="visible">
 
-    <Button
-            android:id="@+id/toggle_state"
+    <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/imageState"
-            android:background="@color/background_main_toolbar"
-            />
+            android:layout_height="match_parent"
+            >
 
-    <View
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:visibility="invisible"
-            android:layout_gravity="top"
-            android:layout_weight="1" />
-
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_gravity="bottom">
-
-        <LinearLayout
-                android:id="@+id/controlArea"
+        <Button
+                android:id="@+id/toggle_state"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:layout_alignParentBottom="true"
-                android:visibility="visible">
-
-            <SeekBar
-                    android:id="@+id/primarySeekBar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    style="@style/FilterShowSlider"/>
-
-        </LinearLayout>
+                android:text="@string/imageState"
+                android:background="@color/background_main_toolbar"
+                android:layout_alignParentTop="true"
+                />
 
         <LinearLayout
+                android:id="@+id/applyBar"
                 android:layout_width="match_parent"
                 android:layout_height="48dip"
                 android:background="@color/background_main_toolbar"
                 android:orientation="horizontal"
                 android:baselineAligned="false"
-                android:visibility="visible">
+                android:visibility="visible"
+                android:layout_alignParentBottom="true"
+                >
 
             <ImageButton
                     android:id="@+id/cancelFilter"
@@ -102,7 +81,7 @@
                         android:text="@string/apply_effect"
                         android:textSize="18dip"
                         android:drawableRight="@drawable/filtershow_menu_marker"
-                        android:textAllCaps="true" />
+                        android:textAllCaps="true"/>
 
             </LinearLayout>
 
@@ -122,6 +101,25 @@
                     android:src="@drawable/ic_menu_done_holo_light"
                     android:textSize="18dip"/>
         </LinearLayout>
-    </LinearLayout>
 
+        <LinearLayout
+                android:id="@+id/controlArea"
+                android:layout_width="match_parent"
+                android:layout_height="fill_parent"
+                android:orientation="vertical"
+                android:layout_above="@id/applyBar"
+                android:layout_below="@id/toggle_state"
+                android:gravity="bottom"
+                android:visibility="visible">
+
+            <SeekBar
+                    android:id="@+id/primarySeekBar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    style="@style/FilterShowSlider"/>
+
+        </LinearLayout>
+
+    </RelativeLayout>
 </LinearLayout>
diff --git a/res/layout-land/filtershow_saturation_controls.xml b/res/layout-land/filtershow_saturation_controls.xml
new file mode 100644
index 000000000..42c9dc094
--- /dev/null
+++ b/res/layout-land/filtershow_saturation_controls.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<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">
+
+    <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+        <GridLayout
+                android:orientation="horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:alignmentMode="alignBounds"
+                android:useDefaultMargins="true"
+                android:columnOrderPreserved="false"
+                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="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:layout_marginLeft="8dp"/>
+            <TextView
+                    android:layout_gravity="right|center_vertical"
+                    android:id="@+id/redValue"
+                    android:layout_marginRight="8dp"/>
+            <SeekBar
+                    android:id="@+id/redSeekBar"
+                    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_yellow"
+                    android:layout_marginLeft="8dp"/>
+            <TextView
+                    android:layout_gravity="right|center_vertical"
+                    android:id="@+id/yellowValue"
+                    android:layout_marginRight="8dp"/>
+            <SeekBar
+                    android:id="@+id/yellowSeekBar"
+                    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_green"
+                    android:layout_marginLeft="8dp"/>
+            <TextView
+                    android:layout_gravity="right|center_vertical"
+                    android:id="@+id/greenValue"
+                    android:layout_marginRight="8dp"/>
+            <SeekBar
+                    android:id="@+id/greenSeekBar"
+                    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_cyan"
+                    android:layout_marginLeft="8dp"/>
+            <TextView
+                    android:layout_gravity="right|center_vertical"
+                    android:id="@+id/cyanValue"
+                    android:layout_marginRight="8dp"/>
+            <SeekBar
+                    android:id="@+id/cyanSeekBar"
+                    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_blue"
+                    android:layout_marginLeft="8dp"/>
+            <TextView
+                    android:layout_gravity="right|center_vertical"
+                    android:id="@+id/blueValue"
+                    android:layout_marginRight="8dp"/>
+            <SeekBar
+                    android:id="@+id/blueSeekBar"
+                    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_magenta"
+                    android:layout_marginLeft="8dp"/>
+            <TextView
+                    android:layout_gravity="right|center_vertical"
+                    android:id="@+id/magentaValue"
+                    android:layout_marginRight="8dp"/>
+            <SeekBar
+                    android:id="@+id/magentaSeekBar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/FilterShowSlider"
+                    android:layout_columnSpan="2"/>
+        </GridLayout>
+    </ScrollView>
+
+</LinearLayout>
\ No newline at end of file