diff options
| author | Jack Yoo <jyoo@codeaurora.org> | 2016-09-12 12:48:28 -0700 |
|---|---|---|
| committer | Jay Wang <jaywang@codeaurora.org> | 2016-09-27 15:54:56 -0700 |
| commit | c3a465da5ed9ba64512eda37597e96f6ab839fa8 (patch) | |
| tree | a92a4655021e0be421f02f297f49e063c05b3526 /res | |
| parent | 8f6566e427e0091e95974768596e29220c2f181b (diff) | |
| download | android_packages_apps_Snap-c3a465da5ed9ba64512eda37597e96f6ab839fa8.tar.gz android_packages_apps_Snap-c3a465da5ed9ba64512eda37597e96f6ab839fa8.tar.bz2 android_packages_apps_Snap-c3a465da5ed9ba64512eda37597e96f6ab839fa8.zip | |
SnapdragonCamera: Makeup feature
Makeup feature for camera preview and video
Change-Id: Ia8cdb629372333c9dceef8aa474402553b7259f0
CRs-Fixed: 1067848
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable/beautify_on.png | bin | 0 -> 17681 bytes | |||
| -rw-r--r-- | res/layout/one_ui_layout.xml | 9 | ||||
| -rw-r--r-- | res/values/camera2arrays.xml | 26 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 2 |
4 files changed, 31 insertions, 6 deletions
diff --git a/res/drawable/beautify_on.png b/res/drawable/beautify_on.png Binary files differnew file mode 100644 index 000000000..928e394e0 --- /dev/null +++ b/res/drawable/beautify_on.png diff --git a/res/layout/one_ui_layout.xml b/res/layout/one_ui_layout.xml index 22c2c42e3..b6de2c5db 100644 --- a/res/layout/one_ui_layout.xml +++ b/res/layout/one_ui_layout.xml @@ -83,8 +83,13 @@ <com.android.camera.ui.RotateImageView android:id="@+id/ts_makeup_switcher" - style="@style/OneUIMenuButton" - android:src="@drawable/beautify" /> + style="@style/OneUIMenuButton" /> + + <SeekBar + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/ts_makeup_seekbar" + android:visibility="gone"/> <LinearLayout android:id="@+id/remaining_photos" diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index f4c17d6c4..3108cf8a3 100644 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -61,13 +61,31 @@ </string-array> <string-array name="pref_camera2_makeup_entries" translatable="true"> - <item>On</item> - <item>Off</item> + <item>0</item> + <item>10</item> + <item>20</item> + <item>30</item> + <item>40</item> + <item>50</item> + <item>60</item> + <item>70</item> + <item>80</item> + <item>90</item> + <item>100</item> </string-array> <string-array name="pref_camera2_makeup_entryvalues" translatable="false"> - <item>on</item> - <item>off</item> + <item>0</item> + <item>10</item> + <item>20</item> + <item>30</item> + <item>40</item> + <item>50</item> + <item>60</item> + <item>70</item> + <item>80</item> + <item>90</item> + <item>100</item> </string-array> <string-array name="pref_camera2_trackingfocus_entries" translatable="true"> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 04bebfc16..b6e6afdce 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -1047,5 +1047,7 @@ <string name="pref_camera2_timer_value_5sec" translatable="false">5</string> <string name="pref_camera2_timer_value_10sec" translatable="false">10</string> <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> </resources> |
