From e6e45c4fcd5f99e23fd81aa1d34c37ffb8b16972 Mon Sep 17 00:00:00 2001
From: junjiez <junjiez@codeaurora.org>
Date: Mon, 14 Nov 2016 16:12:13 +0800
Subject: SnapdragonCamera:Modify beautify interface

Modify beautify interface, make it the same as
the design. Disable FilterMode button and SceneMode
button when beautify is enabled.

Change-Id: I0ba976973ff06df4e17a93c76781127dda090416
CRs-Fixed: 1084369
---
 res/layout/one_ui_layout.xml | 49 +++++++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 19 deletions(-)
 mode change 100644 => 100755 res/layout/one_ui_layout.xml

(limited to 'res/layout')

diff --git a/res/layout/one_ui_layout.xml b/res/layout/one_ui_layout.xml
old mode 100644
new mode 100755
index 2a87b6cd2..d2a4f04f9
--- a/res/layout/one_ui_layout.xml
+++ b/res/layout/one_ui_layout.xml
@@ -91,42 +91,53 @@
         android:id="@+id/makeup_seekbar_layout"
         android:visibility="gone">
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
+            android:layout_width="12dp"
+            android:layout_height="20dp"
+            android:layout_marginLeft="23dp"
+            android:layout_marginRight="23dp"
             android:id="@+id/seekbar_toggle">
         </ImageView>
         <RelativeLayout
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/seekbar_body">
             <com.android.camera.ui.RotateLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
                 android:layout_alignParentLeft="true"
                 android:id="@+id/makeup_low_text">
                 <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/makeup_seekbar_low">
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:textSize="12sp"
+                    android:gravity="center"
+                    android:text="@string/makeup_seekbar_low"
+                    android:textColor="@android:color/white">
                 </TextView>
             </com.android.camera.ui.RotateLayout>
             <SeekBar
-                    android:layout_width="match_parent"
+                    android:layout_width="220dp"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="100dp"
-                    android:paddingRight="100dp"
+                    android:maxHeight="3dip"
+                    android:minHeight="1dip"
+                    android:layout_marginLeft="10dp"
+                    android:layout_toRightOf="@+id/makeup_low_text"
+                    android:progressDrawable="@drawable/beautify_progressbar_style"
+                    android:thumb="@drawable/ic_beautify_oval"
                     android:id="@+id/makeup_seekbar"/>
             <com.android.camera.ui.RotateLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_toRightOf="@+id/makeup_seekbar"
+                android:layout_marginLeft="10dp"
                 android:id="@+id/makeup_high_text">
                 <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/makeup_seekbar_high">
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:textSize="12sp"
+                    android:gravity="center"
+                    android:text="@string/makeup_seekbar_high"
+                    android:textColor="@android:color/white">
                 </TextView>
             </com.android.camera.ui.RotateLayout>
         </RelativeLayout>
-- 
cgit v1.2.3