diff options
| author | Camera Software Integration <camswint@localhost> | 2016-12-01 09:16:39 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-01 09:16:39 -0800 |
| commit | 42413bd3b8c7e363f6a4e5443f3f93913f2349ec (patch) | |
| tree | 1fb4f2d0f367cb6b3e2f144cbf4c2b8bc86f0a6e /res/layout | |
| parent | d17195f046cceff271bc6075b0663e32708c6803 (diff) | |
| parent | e6e45c4fcd5f99e23fd81aa1d34c37ffb8b16972 (diff) | |
| download | android_packages_apps_Snap-42413bd3b8c7e363f6a4e5443f3f93913f2349ec.tar.gz android_packages_apps_Snap-42413bd3b8c7e363f6a4e5443f3f93913f2349ec.tar.bz2 android_packages_apps_Snap-42413bd3b8c7e363f6a4e5443f3f93913f2349ec.zip | |
Merge "SnapdragonCamera:Modify beautify interface" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'res/layout')
| -rwxr-xr-x[-rw-r--r--] | res/layout/one_ui_layout.xml | 49 |
1 files changed, 30 insertions, 19 deletions
diff --git a/res/layout/one_ui_layout.xml b/res/layout/one_ui_layout.xml index de6c8b401..d87040cde 100644..100755 --- a/res/layout/one_ui_layout.xml +++ b/res/layout/one_ui_layout.xml @@ -96,42 +96,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> |