diff options
| author | Camera Software Integration <camswint@quicinc.com> | 2018-01-16 03:21:54 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-01-16 03:21:54 -0800 |
| commit | b17352a86a3aabd3ff7989326ca292f3837e472c (patch) | |
| tree | ebfca4482ed18daeceb5d81417bc95d6fd221a9c /res | |
| parent | f1058f12aee4126a452d76114c7a29e1bcd1cf57 (diff) | |
| parent | a65c9f0023fdb5903e701aaaf1b4916743e9c953 (diff) | |
| download | android_packages_apps_Snap-b17352a86a3aabd3ff7989326ca292f3837e472c.tar.gz android_packages_apps_Snap-b17352a86a3aabd3ff7989326ca292f3837e472c.tar.bz2 android_packages_apps_Snap-b17352a86a3aabd3ff7989326ca292f3837e472c.zip | |
Merge "Snapdragon: Add bokeh enable options in dev" into camera.lnx.3.0-dev
Diffstat (limited to 'res')
| -rwxr-xr-x | res/layout/one_ui_layout.xml | 12 | ||||
| -rw-r--r-- | res/values/camera2arrays.xml | 6 | ||||
| -rw-r--r-- | res/values/strings.xml | 1 |
3 files changed, 18 insertions, 1 deletions
diff --git a/res/layout/one_ui_layout.xml b/res/layout/one_ui_layout.xml index 59e31b95d..6baed0579 100755 --- a/res/layout/one_ui_layout.xml +++ b/res/layout/one_ui_layout.xml @@ -222,4 +222,16 @@ </com.android.camera.ui.RotateLayout> </RelativeLayout> </LinearLayout> + + <SeekBar + android:layout_width="220dp" + android:layout_height="wrap_content" + android:maxHeight="3dip" + android:minHeight="1dip" + android:layout_gravity="center_horizontal|bottom" + android:layout_marginBottom="90dp" + android:progressDrawable="@drawable/beautify_progressbar_style" + android:thumb="@drawable/ic_beautify_oval" + android:id="@+id/bokeh_seekbar" + android:visibility="invisible"/> </com.android.camera.ui.OneUICameraControls> diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index 24fe49712..7b0c003d1 100644 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -128,7 +128,6 @@ <item>@string/pref_camera2_mpo_value_on</item> </string-array> - <!-- Refer to CONTROL_SCENE_MODE of Camera2 API for values -1 refers to ones not supported in Camera2 API 0 is special case added for auto (meaning off) @@ -158,6 +157,7 @@ <item>108</item> <item>104</item> <item>109</item> + <item>110</item> </string-array> <!-- Camera Preferences Scene Mode dialog box entries --> @@ -185,6 +185,7 @@ <item>@string/pref_camera_scenemode_entry_trackingfocus</item> <item>@string/pref_camera_scenemode_entry_panorama</item> <item>@string/pref_camera_scenemode_entry_promode</item> + <item>@string/pref_camera_scenemode_entry_bokeh</item> </string-array> <array name="pref_camera2_scenemode_thumbnails" translatable="false"> @@ -211,6 +212,7 @@ <item>@drawable/tracking_focus</item> <item>@drawable/scene_panorama</item> <item>@drawable/promode</item> + <item>@drawable/ic_bokeh_off</item> </array> <array name="pref_camera2_scenemode_black_thumbnails" translatable="false"> @@ -237,6 +239,7 @@ <item>@drawable/ic_scene_mode_black_tracking_focus</item> <item>@drawable/ic_scene_mode_black_panorama</item> <item>@drawable/ic_scene_mode_black_dual_camera</item> + <item>@drawable/ic_bokeh_on</item> </array> <!-- Camera Preferences Scene Mode dialog box entries --> @@ -264,6 +267,7 @@ <item>@string/pref_camera2_scene_mode_tracking_focus_instructional_content</item> <item>@string/pref_camera2_scene_mode_panorama_instructional_content</item> <item>@string/pref_camera2_scene_mode_pro_instructional_content</item> + <item>""</item> </string-array> <string-array name="pref_camera2_whitebalance_entryvalues" translatable="false"> diff --git a/res/values/strings.xml b/res/values/strings.xml index 42ad07272..387b9a01b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -412,6 +412,7 @@ <!-- Scene mode for refocus feature [CHAR LIMIT=16] --> <string name="pref_camera_scenemode_entry_refocus">UbiFocus</string> <string name="pref_camera_scenemode_entry_optizoom">OptiZoom</string> + <string name="pref_camera_scenemode_entry_bokeh">Bokeh</string> <!-- Settings menu, scene mode labels [CHAR LIMIT=50] --> <string name="pref_camera_scenemode_label_auto">NONE</string> |