diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-06-14 12:34:22 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-06-14 12:34:22 -0700 |
| commit | 58b31f9123f2060a2ea8726a9176129dca554b34 (patch) | |
| tree | 648e9fa877abafa821e992537c65dfcad66d147d /res | |
| parent | 372fcbc333efedafde3aa6df288d498069507861 (diff) | |
| parent | cb4748b2c5e264fc5185005d366cbdf5db140674 (diff) | |
| download | android_packages_apps_Snap-58b31f9123f2060a2ea8726a9176129dca554b34.tar.gz android_packages_apps_Snap-58b31f9123f2060a2ea8726a9176129dca554b34.tar.bz2 android_packages_apps_Snap-58b31f9123f2060a2ea8726a9176129dca554b34.zip | |
Merge "Camera2: Adding support for Auto HDR"
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/photo_module.xml | 6 | ||||
| -rw-r--r-- | res/values/qcomarrays.xml | 11 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 10 | ||||
| -rw-r--r-- | res/xml/camera_preferences.xml | 6 |
4 files changed, 33 insertions, 0 deletions
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index c59d74300..89bc1ff39 100644 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -56,6 +56,12 @@ android:layout_height="200dip" android:layout_marginTop="60dip" android:layout_marginLeft="90dip" /> + <com.android.camera.DrawAutoHDR + android:id="@+id/autohdr_view" + android:layout_width="200dip" + android:layout_height="200dip" + android:layout_marginTop="15dip" + android:layout_marginLeft="15dip" /> <TableLayout android:id="@+id/relative_seek" android:layout_width="match_parent" diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index c19bd673c..bd808fed3 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -590,5 +590,16 @@ <item>@string/setting_on_value</item> </string-array> + <!-- AUTO HDR dialog box entries --> + <string-array name="pref_camera_auto_hdr_entries" translatable="false"> + <item>@string/pref_camera_auto_hdr_entry_enable</item> + <item>@string/pref_camera_auto_hdr_entry_disable</item> + </string-array> + + <string-array name="pref_camera_auto_hdr_entryvalues" translatable="false"> + <item>@string/pref_camera_auto_hdr_value_enable</item> + <item>@string/pref_camera_auto_hdr_value_disable</item> + </string-array> + </resources> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index ab5381451..b54fb1f91 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -666,5 +666,15 @@ <!-- Toast showing non-supported functionality for flash in AE bracket --> <string name="flash_aebracket_message">Flash is not supported in AE-Bracket Mode</string> + <!-- Settings screen, setting title text for Auto HDR--> + <string name="pref_camera_auto_hdr_title">AUTO HDR</string> + <string name="pref_camera_auto_hdr_default" translatable="false"> + disable</string> + + <!-- Settings screen, Auto HDR location dialog choices --> + <string name="pref_camera_auto_hdr_entry_enable">Enable</string> + <string name="pref_camera_auto_hdr_entry_disable">Disable</string> + <string name="pref_camera_auto_hdr_value_enable">enable</string> + <string name="pref_camera_auto_hdr_value_disable">disable</string> </resources> diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index db56927a7..f1d16fda5 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -250,4 +250,10 @@ camera:entries="@array/pref_camera_longshot_entries" camera:entryValues="@array/pref_camera_longshot_entryvalues" /> + <ListPreference + camera:key="pref_camera_auto_hdr_key" + camera:defaultValue="@string/pref_camera_auto_hdr_default" + camera:title="@string/pref_camera_auto_hdr_title" + camera:entries="@array/pref_camera_auto_hdr_entries" + camera:entryValues="@array/pref_camera_auto_hdr_entryvalues" /> </PreferenceGroup> |