diff options
| author | Angus Kong <shkong@google.com> | 2013-03-18 18:27:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-18 18:27:50 +0000 |
| commit | a331a12a4b1da7cb17f5a078cf21a03896e37496 (patch) | |
| tree | adefa7e2370ad07e05ee19be8bb5f69bdb7038f6 /src | |
| parent | 4230534827415a30840e122347354ea0be95a701 (diff) | |
| parent | 1580df6aed1e5569ede61af0949279819ec03119 (diff) | |
| download | android_packages_apps_Snap-a331a12a4b1da7cb17f5a078cf21a03896e37496.tar.gz android_packages_apps_Snap-a331a12a4b1da7cb17f5a078cf21a03896e37496.tar.bz2 android_packages_apps_Snap-a331a12a4b1da7cb17f5a078cf21a03896e37496.zip | |
Merge "Add shared preference key of LightCycle." into gb-ub-photos-bryce
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 1 | ||||
| -rw-r--r-- | src/com/android/camera/ComboPreferences.java | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 7c7ed389e..d0d575c5f 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -63,6 +63,7 @@ public class CameraSettings { public static final String KEY_CAMERA_HDR = "pref_camera_hdr_key"; public static final String KEY_CAMERA_FIRST_USE_HINT_SHOWN = "pref_camera_first_use_hint_shown_key"; public static final String KEY_VIDEO_FIRST_USE_HINT_SHOWN = "pref_video_first_use_hint_shown_key"; + public static final String KEY_PHOTOSPHERE_PICTURESIZE = "pref_photosphere_picturesize_key"; public static final String EXPOSURE_DEFAULT_VALUE = "0"; diff --git a/src/com/android/camera/ComboPreferences.java b/src/com/android/camera/ComboPreferences.java index 9155fb3eb..c561e6b9c 100644 --- a/src/com/android/camera/ComboPreferences.java +++ b/src/com/android/camera/ComboPreferences.java @@ -148,7 +148,8 @@ public class ComboPreferences implements || key.equals(CameraSettings.KEY_VIDEO_FIRST_USE_HINT_SHOWN) || key.equals(CameraSettings.KEY_VIDEO_EFFECT) || key.equals(CameraSettings.KEY_TIMER) - || key.equals(CameraSettings.KEY_TIMER_SOUND_EFFECTS); + || key.equals(CameraSettings.KEY_TIMER_SOUND_EFFECTS) + || key.equals(CameraSettings.KEY_PHOTOSPHERE_PICTURESIZE); } @Override |