diff options
| author | Michael Kolb <kolby@google.com> | 2012-10-03 13:30:22 -0700 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2012-10-03 13:30:22 -0700 |
| commit | 019cd2a91262707cf4f435f255d433666bc71706 (patch) | |
| tree | abbdab1e5f061f910afa16e741be309ef2d198bb /src | |
| parent | 63e79531bd35bd5bc1fc11cbc1f93acb6b9c7b0b (diff) | |
| download | Camera-019cd2a91262707cf4f435f255d433666bc71706.tar.gz | |
Hide event blocker when hiding switcher
Bug: 7280812
Change-Id: I3c6f668512fc6cddc4f9c54a4ef44ff2e59734d9
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index acc90323..4ef5e732 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -49,6 +49,7 @@ public class CameraActivity extends ActivityBase private RotateImageView mMenu; private CameraSwitcher mSwitcher; private View mShutterSwitcher; + private View mBlocker; private Drawable[] mDrawables; private int mCurrentModuleIndex; private MenuListener mMenuListener; @@ -99,6 +100,7 @@ public class CameraActivity extends ActivityBase } public void init() { + mBlocker = findViewById(R.id.blocker); mShutterSwitcher = findViewById(R.id.camera_shutter_switcher); mShutter = (ShutterButton) findViewById(R.id.shutter_button); mShutterIcon = (RotateImageView) findViewById(R.id.shutter_overlay); @@ -235,18 +237,21 @@ public class CameraActivity extends ActivityBase public void hideSwitcher(int resid) { mSwitcher.setVisibility(View.GONE); mMenu.setVisibility(View.GONE); + mBlocker.setVisibility(View.GONE); showShutterIcon(true, resid); } public void hideSwitcher() { mSwitcher.setVisibility(View.GONE); mMenu.setVisibility(View.GONE); + mBlocker.setVisibility(View.GONE); showShutterIcon(true); } public void showSwitcher() { if (mCurrentModule.needsSwitcher()) { mSwitcher.setVisibility(View.VISIBLE); + mBlocker.setVisibility(View.VISIBLE); if (mMenuListener != null) { mMenu.setVisibility(View.VISIBLE); } |