diff options
Diffstat (limited to 'src/com/android/camera/CaptureUI.java')
-rw-r--r-- | src/com/android/camera/CaptureUI.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index f47401514..50104570d 100644 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -90,7 +90,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, SettingsManager.KEY_TIMER, SettingsManager.KEY_CAMERA_SAVEPATH, SettingsManager.KEY_LONGSHOT, - SettingsManager.KEY_ISO, SettingsManager.KEY_EXPOSURE, SettingsManager.KEY_WHITE_BALANCE, SettingsManager.KEY_CAMERA2 @@ -275,6 +274,12 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, return mSceneAndFilterLayout; } + public void reInitUI() { + initializeSettingMenu(); + initSceneModeButton(); + initFilterModeButton(); + } + // called from onResume but only the first time public void initializeFirstTime() { // Initialize shutter button. @@ -987,7 +992,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, mThumbnail.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (!CameraControls.isAnimating() && mModule.isTouchToFocusAllowed()) + if (!CameraControls.isAnimating() && !mModule.isTakingPicture()) mActivity.gotoGallery(); } }); |