diff options
author | Jack Yoo <jyoo@codeaurora.org> | 2016-09-23 13:39:31 -0700 |
---|---|---|
committer | Jack Yoo <jyoo@codeaurora.org> | 2016-10-13 15:56:14 -0700 |
commit | e42adc9e85653ed4b9aa1f71b6343bccc28d155c (patch) | |
tree | 3d1fcfacb47947f6b7bc982473d1f95290b1ef39 /res | |
parent | a5ee184ddb1048795af51102dab7e3b670114729 (diff) | |
download | android_packages_apps_Snap-e42adc9e85653ed4b9aa1f71b6343bccc28d155c.tar.gz android_packages_apps_Snap-e42adc9e85653ed4b9aa1f71b6343bccc28d155c.tar.bz2 android_packages_apps_Snap-e42adc9e85653ed4b9aa1f71b6343bccc28d155c.zip |
SnapdragonCamera: Enhancing makeup UI
Improvising makeup user experience.
Change-Id: I744775711e3cd9bc0a14a47ca82e26eecc68bb6d
CRs-Fixed: 1071798
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/one_ui_layout.xml | 35 | ||||
-rw-r--r-- | res/values/qcomstrings.xml | 2 | ||||
-rw-r--r-- | res/xml/capture_preferences.xml | 2 |
3 files changed, 35 insertions, 4 deletions
diff --git a/res/layout/one_ui_layout.xml b/res/layout/one_ui_layout.xml index b6de2c5db..3b4f0b334 100644 --- a/res/layout/one_ui_layout.xml +++ b/res/layout/one_ui_layout.xml @@ -85,11 +85,40 @@ android:id="@+id/ts_makeup_switcher" style="@style/OneUIMenuButton" /> - <SeekBar + <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:id="@+id/ts_makeup_seekbar" - android:visibility="gone"/> + android:id="@+id/makeup_seekbar_layout" + android:visibility="gone"> + <com.android.camera.ui.RotateLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + 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"> + </TextView> + </com.android.camera.ui.RotateLayout> + <SeekBar + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="100dp" + android:paddingRight="100dp" + 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:id="@+id/makeup_high_text"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/makeup_seekbar_high"> + </TextView> + </com.android.camera.ui.RotateLayout> + </RelativeLayout> <LinearLayout android:id="@+id/remaining_photos" diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index b7d30bca7..986ff8b3d 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -1049,5 +1049,7 @@ <string name="panocapture_direction_is_not_determined" translatable="true">Direction is not detected.</string> <string name="makeup_ui_title" translatable="true">Please choose the strength of the beautification.</string> <string name="makeup_ui_ok_button" translatable="true">OK</string> + <string name="makeup_seekbar_low" translatable="true">low</string> + <string name="makeup_seekbar_high" translatable="true">high</string> </resources> diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index 93b55bde1..fd1424f50 100644 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -182,7 +182,7 @@ camera:entryValues="@array/pref_camera2_initial_camera_entryvalues"/> <ListPreference - camera:defaultValue="off" + camera:defaultValue="0" camera:key="pref_camera2_makeup_key" camera:entries="@array/pref_camera2_makeup_entries" camera:entryValues="@array/pref_camera2_makeup_entryvalues" |