am 1d1af906: Merge "previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button" into ub-camera-fishlake

* commit '1d1af90609b7a896f74dda83b7f22f91b50e70cf':
  previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button

1 files changed, 1 insertions, 19 deletions

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index fe060bf30..869ec388d 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -237,7 +237,6 @@ public class CameraActivity extends Activity
     private LocalMediaObserver mLocalVideosObserver;
 
     private boolean mPendingDeletion = false;
-    private boolean mSavedShutterEnabledState = true;
 
     private CameraController mCameraController;
     private boolean mPaused;
@@ -1067,18 +1066,9 @@ public class CameraActivity extends Activity
         // TODO: implement this
     }
 
-    private void saveShutterEnabledState() {
-        mSavedShutterEnabledState = isShutterEnabled();
-    }
-
-    private void restoreShutterEnabledState() {
-        setShutterEnabled(mSavedShutterEnabledState);
-    }
-
     @Override
     public void setShutterEnabled(boolean enabled) {
         mCameraAppUI.setShutterButtonEnabled(enabled);
-        saveShutterEnabledState();
     }
 
     @Override
@@ -1328,15 +1318,7 @@ public class CameraActivity extends Activity
             @Override
             public void onVisibilityChanged(boolean visible) {
                 mModeListVisible = visible;
-                if (visible) {
-                    saveShutterEnabledState();
-                    // bypass own setShutterEnabled()
-                    // which will blow away whatever's stored in
-                    // mSavedShutterEnabledState
-                    mCameraAppUI.setShutterButtonEnabled(false);
-                } else {
-                    restoreShutterEnabledState();
-                }
+                mCameraAppUI.setShutterButtonImportantToA11y(!visible);
                 updatePreviewVisibility();
             }
         });