summaryrefslogtreecommitdiffstats
path: root/res/layout/one_ui_layout.xml
diff options
context:
space:
mode:
authorWeijie Wang <weijiew@codeaurora.org>2017-09-02 12:11:20 +0800
committerWeijie Wang <weijiew@codeaurora.org>2017-09-02 12:11:20 +0800
commitf884ef3a01cefaf71f6ff0ed059c8d356b40c17c (patch)
treeb4b545a0cd632402dddc406247fcd7836b408b84 /res/layout/one_ui_layout.xml
parent2e0ed791732a27bb4d951bfbdaba3ddcda4e6b2c (diff)
downloadandroid_packages_apps_Snap-f884ef3a01cefaf71f6ff0ed059c8d356b40c17c.tar.gz
android_packages_apps_Snap-f884ef3a01cefaf71f6ff0ed059c8d356b40c17c.tar.bz2
android_packages_apps_Snap-f884ef3a01cefaf71f6ff0ed059c8d356b40c17c.zip
Revert "SnapdragonCamera: Sync LA.UM.6.4 to LA.UM.6.3"
This reverts commit b5533d51a7c97138235d29b35cec876d107aeadd. Change-Id: I8063422680802e25d03a374be91e884a86ad55e9
Diffstat (limited to 'res/layout/one_ui_layout.xml')
-rwxr-xr-x[-rw-r--r--]res/layout/one_ui_layout.xml99
1 files changed, 49 insertions, 50 deletions
diff --git a/res/layout/one_ui_layout.xml b/res/layout/one_ui_layout.xml
index 59e31b95d..5904b5b96 100644..100755
--- a/res/layout/one_ui_layout.xml
+++ b/res/layout/one_ui_layout.xml
@@ -133,48 +133,15 @@
style="@style/OneUIMenuButton" />
<LinearLayout
- android:id="@+id/remaining_photos"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@android:color/transparent"
- android:orientation="horizontal"
- android:visibility="gone">
-
- <TextView
- android:id="@+id/remaining_photos_text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@android:color/transparent"
- android:textColor="@android:color/white"
- android:visibility="gone" />
-
- <ImageView
- android:id="@+id/remaining_photos_image"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/remaining_sheets"
- android:visibility="gone" />
- </LinearLayout>
-
- <include layout="@layout/pro_mode_layout" />
-
- <ImageView
- android:id="@+id/promode_close_button"
- android:layout_height="20dp"
- android:layout_width="20dp"
- android:src="@drawable/icon_x" />
-
- <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/makeup_seekbar_layout"
android:visibility="gone">
<ImageView
- android:layout_width="30dp"
- android:layout_height="40dp"
- android:layout_marginLeft="20dp"
- android:layout_marginRight="10dp"
- android:src="@drawable/seekbar_hide"
+ android:layout_width="12dp"
+ android:layout_height="20dp"
+ android:layout_marginLeft="23dp"
+ android:layout_marginRight="23dp"
android:id="@+id/seekbar_toggle">
</ImageView>
<RelativeLayout
@@ -182,8 +149,8 @@
android:layout_height="wrap_content"
android:id="@+id/seekbar_body">
<com.android.camera.ui.RotateLayout
- android:layout_width="30dp"
- android:layout_height="40dp"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
android:layout_alignParentLeft="true"
android:id="@+id/makeup_low_text">
<TextView
@@ -196,18 +163,18 @@
</TextView>
</com.android.camera.ui.RotateLayout>
<SeekBar
- android:layout_width="220dp"
- android:layout_height="40dp"
- 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"/>
+ android:layout_width="220dp"
+ android:layout_height="wrap_content"
+ 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="30dp"
- android:layout_height="40dp"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
android:layout_toRightOf="@+id/makeup_seekbar"
android:layout_marginLeft="10dp"
android:id="@+id/makeup_high_text">
@@ -222,4 +189,36 @@
</com.android.camera.ui.RotateLayout>
</RelativeLayout>
</LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/remaining_photos"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@android:color/transparent"
+ android:orientation="horizontal"
+ android:visibility="gone">
+
+ <TextView
+ android:id="@+id/remaining_photos_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@android:color/transparent"
+ android:textColor="@android:color/white"
+ android:visibility="gone" />
+
+ <ImageView
+ android:id="@+id/remaining_photos_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/remaining_sheets"
+ android:visibility="gone" />
+ </LinearLayout>
+
+ <include layout="@layout/pro_mode_layout" />
+
+ <ImageView
+ android:id="@+id/promode_close_button"
+ android:layout_height="20dp"
+ android:layout_width="20dp"
+ android:src="@drawable/icon_x" />
</com.android.camera.ui.OneUICameraControls>