summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ComboPreferences.java
diff options
context:
space:
mode:
authorSuman Mukherjee <sumam@codeaurora.org>2014-05-29 12:20:47 +0530
committerSuman Mukherjee <sumam@codeaurora.org>2014-05-29 12:20:47 +0530
commit446cfa4b33ef182ba0e28befb75448dce626f16d (patch)
tree5a9a32f0d39a6baefe4bd1499c0702c05e012b91 /src/com/android/camera/ComboPreferences.java
parent0542ce1f6f50af1ef45d8623ff3cdc2cc3a92f6b (diff)
downloadandroid_packages_apps_Snap-446cfa4b33ef182ba0e28befb75448dce626f16d.tar.gz
android_packages_apps_Snap-446cfa4b33ef182ba0e28befb75448dce626f16d.tar.bz2
android_packages_apps_Snap-446cfa4b33ef182ba0e28befb75448dce626f16d.zip
Camera: Move out TimeLapse option from global list
TimeLapse setting was common for front and back camera As there is no specific reason to have it common, to align with other settings, moved it out from common list so that Timelapse setting change in front camrea will not affect for back camera and vice versa. CRs-Fixed: 654627 Change-Id: I0b14284adc6063ccb9bf175a37644c162bb47fd5
Diffstat (limited to 'src/com/android/camera/ComboPreferences.java')
-rw-r--r--src/com/android/camera/ComboPreferences.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/camera/ComboPreferences.java b/src/com/android/camera/ComboPreferences.java
index b77a52b2d..d0039ab9e 100644
--- a/src/com/android/camera/ComboPreferences.java
+++ b/src/com/android/camera/ComboPreferences.java
@@ -144,8 +144,7 @@ public class ComboPreferences implements
}
private static boolean isGlobal(String key) {
- return key.equals(CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL)
- || key.equals(CameraSettings.KEY_CAMERA_ID)
+ return key.equals(CameraSettings.KEY_CAMERA_ID)
|| key.equals(CameraSettings.KEY_RECORD_LOCATION)
|| key.equals(CameraSettings.KEY_CAMERA_FIRST_USE_HINT_SHOWN)
|| key.equals(CameraSettings.KEY_VIDEO_FIRST_USE_HINT_SHOWN)