diff options
| author | Alok Kediya <kediya@codeaurora.org> | 2013-09-28 16:51:01 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2013-10-31 19:38:32 -0600 |
| commit | 0ddabc2714b76a44a96900f77b4b99ab3f1465e1 (patch) | |
| tree | 175303ace94fab7e5ab06f4a6faba9e08ef5cb95 /res/values/arrays.xml | |
| parent | a4bd0a6b29311ce9495c620990d7a8df4c0294ca (diff) | |
| download | android_packages_apps_Snap-0ddabc2714b76a44a96900f77b4b99ab3f1465e1.tar.gz android_packages_apps_Snap-0ddabc2714b76a44a96900f77b4b99ab3f1465e1.tar.bz2 android_packages_apps_Snap-0ddabc2714b76a44a96900f77b4b99ab3f1465e1.zip | |
Camera: Fix for focus mode option missing in camera settings
Also add "Normal" and "CAF" options under focus mode settings
(cherrypicked from commit ce394a31d3ad72228861322ff8cf82e494ddf358)
Change-Id: Id9168d43d92adf3e209896b2501f28d4a0f0293c
(cherry picked from commit c207527c898023862063dac98e60da0490af27f1)
(cherry picked from commit 631d0f1abe7447915bd6fd75308d523d7a734cfb)
(cherry picked from commit 8ccaca55d0b6cd75321ab26f2781ae6f8c737270)
Diffstat (limited to 'res/values/arrays.xml')
| -rw-r--r-- | res/values/arrays.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index b108b842d..02ece7733 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -192,7 +192,6 @@ <item>@string/pref_camera_picturesize_entry_qvga</item> <item>@string/pref_camera_picturesize_entry_176x144</item> </string-array> - <!-- When launching the camera app first time, we will set the picture size to the first one in the list that is also supported by the driver --> @@ -226,12 +225,16 @@ <item>@string/pref_camera_focusmode_entry_auto</item> <item>@string/pref_camera_focusmode_entry_infinity</item> <item>@string/pref_camera_focusmode_entry_macro</item> + <item>@string/pref_camera_focusmode_entry_normal</item> + <item>@string/pref_camera_focusmode_entry_continuous</item> </string-array> <string-array name="pref_camera_focusmode_entryvalues" translatable="false"> <item>auto</item> <item>infinity</item> <item>macro</item> + <item>normal</item> + <item>continuous-picture</item> </string-array> <string-array name="pref_camera_focusmode_labels" translatable="false"> @@ -516,7 +519,6 @@ <!-- Default focus mode setting.--> <string-array name="pref_camera_focusmode_default_array" translatable="false"> - <item>continuous-picture</item> <item>auto</item> </string-array> |