diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-19 14:23:33 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-19 14:23:33 -0700 |
| commit | e945dddc2d1582d0246c6d7f823c03d2e33cd847 (patch) | |
| tree | 81611646a5740aa7116e8684809167445a971590 /src | |
| parent | fe259cc762c6a1e59b2f006cf90d7e27866bcd26 (diff) | |
| parent | 3f9376297c6c182f29ca32184448a2871afd4568 (diff) | |
| download | android_packages_apps_Snap-e945dddc2d1582d0246c6d7f823c03d2e33cd847.tar.gz android_packages_apps_Snap-e945dddc2d1582d0246c6d7f823c03d2e33cd847.tar.bz2 android_packages_apps_Snap-e945dddc2d1582d0246c6d7f823c03d2e33cd847.zip | |
Merge "SnapdragonCamera: Set Flash to be the first menu in settings"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 4 | ||||
| -rw-r--r-- | src/com/android/camera/VideoMenu.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 309223213..3bf0b3a88 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -134,6 +134,7 @@ public class PhotoMenu extends MenuController } mOtherKeys1 = new String[] { + CameraSettings.KEY_FLASH_MODE, CameraSettings.KEY_RECORD_LOCATION, CameraSettings.KEY_PICTURE_SIZE, CameraSettings.KEY_JPEG_QUALITY, @@ -144,12 +145,12 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_ISO, CameraSettings.KEY_EXPOSURE, CameraSettings.KEY_WHITE_BALANCE, - CameraSettings.KEY_FLASH_MODE, CameraSettings.KEY_FOCUS_MODE, CameraSettings.KEY_REDEYE_REDUCTION }; mOtherKeys2 = new String[] { + CameraSettings.KEY_FLASH_MODE, CameraSettings.KEY_RECORD_LOCATION, CameraSettings.KEY_PICTURE_SIZE, CameraSettings.KEY_JPEG_QUALITY, @@ -160,7 +161,6 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_ISO, CameraSettings.KEY_EXPOSURE, CameraSettings.KEY_WHITE_BALANCE, - CameraSettings.KEY_FLASH_MODE, CameraSettings.KEY_FOCUS_MODE, CameraSettings.KEY_REDEYE_REDUCTION, CameraSettings.KEY_AUTO_HDR, diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index 63d255715..2706357ef 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -103,15 +103,16 @@ public class VideoMenu extends MenuController initFilterModeButton(mFilterModeSwitcher); // settings popup mOtherKeys1 = new String[] { + CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, CameraSettings.KEY_VIDEO_QUALITY, CameraSettings.KEY_VIDEO_DURATION, CameraSettings.KEY_RECORD_LOCATION, CameraSettings.KEY_CAMERA_SAVEPATH, CameraSettings.KEY_WHITE_BALANCE, - CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE, - CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE + CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE }; mOtherKeys2 = new String[] { + CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, CameraSettings.KEY_VIDEO_QUALITY, CameraSettings.KEY_VIDEO_DURATION, CameraSettings.KEY_RECORD_LOCATION, @@ -119,7 +120,6 @@ public class VideoMenu extends MenuController CameraSettings.KEY_WHITE_BALANCE, CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE, CameraSettings.KEY_SEE_MORE, - CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, CameraSettings.KEY_DIS, CameraSettings.KEY_VIDEO_EFFECT, CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL, |