diff options
| author | Sascha Haeberling <haeberling@google.com> | 2014-08-26 12:15:41 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2014-08-26 14:54:48 -0700 |
| commit | 13b9f0579d7e6db914d040d7440e79016f2a23c5 (patch) | |
| tree | fb3e6da2f0ba2d5fa629b5ab5a6944cabae4eebe | |
| parent | 2cbf09924c050ef794316824a79a894096d58b5a (diff) | |
| download | android_packages_apps_Camera2-13b9f0579d7e6db914d040d7440e79016f2a23c5.tar.gz android_packages_apps_Camera2-13b9f0579d7e6db914d040d7440e79016f2a23c5.tar.bz2 android_packages_apps_Camera2-13b9f0579d7e6db914d040d7440e79016f2a23c5.zip | |
Enable mode options when capture is done.
Bug: 17260403
Change-Id: I9e5c6c8516d5cdbb3fd303715af2a109b171c5f7
| -rw-r--r-- | src/com/android/camera/CaptureModule.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index da850adb0..6b2e98b1e 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -500,6 +500,7 @@ public class CaptureModule extends CameraModule getServices().getRemoteShutterListener().onModuleReady(this); // TODO: Check if we can really take a photo right now (memory, camera // state, ... ). + mAppController.getCameraAppUI().enableModeOptions(); mAppController.setShutterEnabled(true); } @@ -709,6 +710,9 @@ public class CaptureModule extends CameraModule @Override public void onReadyStateChanged(boolean readyForCapture) { + if (readyForCapture) { + mAppController.getCameraAppUI().enableModeOptions(); + } mAppController.setShutterEnabled(readyForCapture); } @@ -725,6 +729,8 @@ public class CaptureModule extends CameraModule @Override public void onPictureTaken(CaptureSession session) { + mAppController.getCameraAppUI().enableModeOptions(); + mAppController.getCameraAppUI().setShutterButtonEnabled(true); } @Override |