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 /src/com/android/camera/Camera.java | |
| parent | bc85294715ce88c8378af3b77f7a0d27d7ceeaba (diff) | |
| download | packages_apps_LegacyCamera-60dc073ff3087af41f9cf3b738eaa74bb2212f95.zip packages_apps_LegacyCamera-60dc073ff3087af41f9cf3b738eaa74bb2212f95.tar.gz packages_apps_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 'src/com/android/camera/Camera.java')
| -rw-r--r-- | src/com/android/camera/Camera.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 2ead501..151ef7a 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -1026,8 +1026,9 @@ public class Camera extends ActivityBase implements FocusManager.Listener, public void onCreate(Bundle icicle) { super.onCreate(icicle); getPreferredCameraId(); - mFocusManager = new FocusManager(mPreferences, - getString(R.string.pref_camera_focusmode_default)); + String[] defaultFocusModes = getResources().getStringArray( + R.array.pref_camera_focusmode_default_array); + mFocusManager = new FocusManager(mPreferences, defaultFocusModes); /* * To reduce startup time, we start the camera open and preview threads. |