diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2011-10-27 19:50:21 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2011-10-28 12:43:44 +0800 |
| commit | 60dc073ff3087af41f9cf3b738eaa74bb2212f95 (patch) | |
| tree | 0c9466be7359ed5678602a2d45f6cef8fab98011 /res/values | |
| parent | bc85294715ce88c8378af3b77f7a0d27d7ceeaba (diff) | |
| download | LegacyCamera-60dc073ff3087af41f9cf3b738eaa74bb2212f95.zip LegacyCamera-60dc073ff3087af41f9cf3b738eaa74bb2212f95.tar.gz LegacyCamera-60dc073ff3087af41f9cf3b738eaa74bb2212f95.tar.bz2 | |
Fix 5310099: Accept an array of default values for ListPreference.
The reason we want an array of default values is some of them may
be unsupported on a hardware platform. The first supported value
in the array will be used as the default value.
Change-Id: I9e372304ec0eaea3181cf70c352a50b82d4b8c58
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 6 | ||||
| -rw-r--r-- | res/values/attrs.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index cf17819..e258ad2 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -294,4 +294,10 @@ <item>@drawable/ic_video_effects_background_disco_holo</item> <item>@drawable/ic_video_effects_background_normal_holo_dark</item> </array> + + <!-- Default focus mode setting.--> + <string-array name="pref_camera_focusmode_default_array" translatable="false"> + <item>continuous-picture</item> + <item>auto</item> + </string-array> </resources> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 567d205..b6b272a 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -19,7 +19,7 @@ </declare-styleable> <declare-styleable name="ListPreference"> <attr name="key" format="string" /> - <attr name="defaultValue" format="string" /> + <attr name="defaultValue" format="string|reference" /> <attr name="entryValues" format="reference" /> <attr name="entries" format="reference" /> </declare-styleable> diff --git a/res/values/strings.xml b/res/values/strings.xml index ffe4b8a..d1cde99 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -146,9 +146,6 @@ <string name="pref_camera_picturesize_entry_640x480">VGA</string> <string name="pref_camera_picturesize_entry_320x240">QVGA</string> - <!-- Default focus mode setting.--> - <string name="pref_camera_focusmode_default" translatable="false">continuous-picture</string> - <!-- Settings screen, Focus mode title --> <string name="pref_camera_focusmode_title">Focus mode</string> |