diff options
| author | Chung-yih Wang <cywang@google.com> | 2011-11-22 12:25:55 +0800 |
|---|---|---|
| committer | Chung-yih Wang <cywang@google.com> | 2011-11-22 21:15:33 +0800 |
| commit | 749d056cd82ebfe6e613596d9e22dd355aeeec41 (patch) | |
| tree | d958e55ae33c14faef12b55b3b2fc6d70b0bc35c | |
| parent | 27e33de8b2ee085b4f4136d28eec2ef6e9662fa7 (diff) | |
| download | LegacyCamera-749d056cd82ebfe6e613596d9e22dd355aeeec41.zip LegacyCamera-749d056cd82ebfe6e613596d9e22dd355aeeec41.tar.gz LegacyCamera-749d056cd82ebfe6e613596d9e22dd355aeeec41.tar.bz2 | |
Dismiss open menu if exists.
bug:5648754
Change-Id: I44be2226e65de76e6240adc7b554e0ee7cda2226
| -rw-r--r-- | src/com/android/camera/Camera.java | 3 | ||||
| -rwxr-xr-x | src/com/android/camera/VideoCamera.java | 3 | ||||
| -rwxr-xr-x | src/com/android/camera/panorama/PanoramaActivity.java | 5 |
3 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 5a1beb6..90621c8 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -19,6 +19,7 @@ package com.android.camera; import com.android.camera.ui.CameraPicker; import com.android.camera.ui.FaceView; import com.android.camera.ui.IndicatorControlContainer; +import com.android.camera.ui.PopupManager; import com.android.camera.ui.Rotatable; import com.android.camera.ui.RotateImageView; import com.android.camera.ui.RotateLayout; @@ -1567,6 +1568,8 @@ public class Camera extends ActivityBase implements FocusManager.Listener, mOnResumeTime = SystemClock.uptimeMillis(); mHandler.sendEmptyMessageDelayed(CHECK_DISPLAY_ROTATION, 100); } + // Dismiss open menu if exists. + PopupManager.getInstance(this).notifyShowPopup(null); } @Override diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index 80a9a4c..e93fbca 100755 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -19,6 +19,7 @@ package com.android.camera; import com.android.camera.ui.CameraPicker; import com.android.camera.ui.IndicatorControlContainer; import com.android.camera.ui.IndicatorControlWheelContainer; +import com.android.camera.ui.PopupManager; import com.android.camera.ui.Rotatable; import com.android.camera.ui.RotateImageView; import com.android.camera.ui.RotateLayout; @@ -886,6 +887,8 @@ public class VideoCamera extends ActivityBase mOnResumeTime = SystemClock.uptimeMillis(); mHandler.sendEmptyMessageDelayed(CHECK_DISPLAY_ROTATION, 100); } + // Dismiss open menu if exists. + PopupManager.getInstance(this).notifyShowPopup(null); } private void setPreviewDisplay(SurfaceHolder holder) { diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java index d446e41..1a5a5aa 100755 --- a/src/com/android/camera/panorama/PanoramaActivity.java +++ b/src/com/android/camera/panorama/PanoramaActivity.java @@ -30,6 +30,7 @@ import com.android.camera.ShutterButton; import com.android.camera.Storage; import com.android.camera.Thumbnail; import com.android.camera.Util; +import com.android.camera.ui.PopupManager; import com.android.camera.ui.Rotatable; import com.android.camera.ui.RotateImageView; import com.android.camera.ui.RotateLayout; @@ -1002,9 +1003,13 @@ public class PanoramaActivity extends ActivityBase implements keepScreenOnAwhile(); } catch (CameraHardwareException e) { Util.showErrorAndFinish(this, R.string.cannot_connect_camera); + return; } catch (CameraDisabledException e) { Util.showErrorAndFinish(this, R.string.camera_disabled); + return; } + // Dismiss open menu if exists. + PopupManager.getInstance(this).notifyShowPopup(null); } /** |