diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-08-04 12:50:34 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-08-21 18:46:32 -0700 |
| commit | e3d36c451e9e66c7786c169248c3a8aa06b67de7 (patch) | |
| tree | 1d1fdc563297db51c912203c40ec29a731ae14bc /src/com/android/camera/ComboPreferences.java | |
| parent | 9fc9fd41865ae855b5d8bb925b8100a16aa63c3b (diff) | |
| download | android_packages_apps_Snap-e3d36c451e9e66c7786c169248c3a8aa06b67de7.tar.gz android_packages_apps_Snap-e3d36c451e9e66c7786c169248c3a8aa06b67de7.tar.bz2 android_packages_apps_Snap-e3d36c451e9e66c7786c169248c3a8aa06b67de7.zip | |
camera2: Fix merge issues
Change-Id: I9b55bcaaa03e598e57325f45e80ee8493029edf1
Diffstat (limited to 'src/com/android/camera/ComboPreferences.java')
| -rw-r--r-- | src/com/android/camera/ComboPreferences.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/ComboPreferences.java b/src/com/android/camera/ComboPreferences.java index a094a809e..972d67327 100644 --- a/src/com/android/camera/ComboPreferences.java +++ b/src/com/android/camera/ComboPreferences.java @@ -155,7 +155,7 @@ public class ComboPreferences implements || key.equals(CameraSettings.KEY_PHOTOSPHERE_PICTURESIZE) || key.equals(CameraSettings.KEY_CAMERA_SAVEPATH) || key.equals(CameraSettings.KEY_POWER_SHUTTER) - || key.equals(CameraSettings.KEY_MAX_BRIGHTNESS + || key.equals(CameraSettings.KEY_MAX_BRIGHTNESS) || key.equals(SettingsManager.KEY_CAMERA2) || key.equals(SettingsManager.KEY_CAMERA_ID) || key.equals(SettingsManager.KEY_MONO_ONLY) |