summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-05-10 21:09:01 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-05-10 21:09:01 -0700
commite230cd94928add9d5865ba496069d20736785eb8 (patch)
tree459ef526ce7436587c8798e4756a34d77d1ce3fd /res/layout
parentf64339bcc82eb45157fee3b640da793e316d0484 (diff)
parent0649453254320f7446ab19329a02f0f27aae7aa7 (diff)
downloadandroid_packages_apps_Snap-e230cd94928add9d5865ba496069d20736785eb8.zip
android_packages_apps_Snap-e230cd94928add9d5865ba496069d20736785eb8.tar.gz
android_packages_apps_Snap-e230cd94928add9d5865ba496069d20736785eb8.tar.bz2
Merge "SnapdragonCamera: Fix makeup progressbar insensitive" into camera.lnx.3.0-dev
Diffstat (limited to 'res/layout')
-rwxr-xr-xres/layout/one_ui_layout.xml99
1 files changed, 50 insertions, 49 deletions
diff --git a/res/layout/one_ui_layout.xml b/res/layout/one_ui_layout.xml
index 5904b5b..59e31b9 100755
--- a/res/layout/one_ui_layout.xml
+++ b/res/layout/one_ui_layout.xml
@@ -133,15 +133,48 @@
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="12dp"
- android:layout_height="20dp"
- android:layout_marginLeft="23dp"
- android:layout_marginRight="23dp"
+ android:layout_width="30dp"
+ android:layout_height="40dp"
+ android:layout_marginLeft="20dp"
+ android:layout_marginRight="10dp"
+ android:src="@drawable/seekbar_hide"
android:id="@+id/seekbar_toggle">
</ImageView>
<RelativeLayout
@@ -149,8 +182,8 @@
android:layout_height="wrap_content"
android:id="@+id/seekbar_body">
<com.android.camera.ui.RotateLayout
- android:layout_width="24dp"
- android:layout_height="24dp"
+ android:layout_width="30dp"
+ android:layout_height="40dp"
android:layout_alignParentLeft="true"
android:id="@+id/makeup_low_text">
<TextView
@@ -163,18 +196,18 @@
</TextView>
</com.android.camera.ui.RotateLayout>
<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"/>
+ 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"/>
<com.android.camera.ui.RotateLayout
- android:layout_width="24dp"
- android:layout_height="24dp"
+ android:layout_width="30dp"
+ android:layout_height="40dp"
android:layout_toRightOf="@+id/makeup_seekbar"
android:layout_marginLeft="10dp"
android:id="@+id/makeup_high_text">
@@ -189,36 +222,4 @@
</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>