diff options
author | Steve Kondik <steve@cyngn.com> | 2016-11-20 03:07:22 -0800 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 22:00:44 +0200 |
commit | 4b103963bcb7e8cb7417b6f26643c272d0a5d6d0 (patch) | |
tree | a195b179a97dc78e300939c24580170b1b3b4a58 /src | |
parent | dde6d7ec36120db7dbb52bbdb0c7ffeaf7e46e93 (diff) | |
download | android_packages_apps_Snap-4b103963bcb7e8cb7417b6f26643c272d0a5d6d0.tar.gz android_packages_apps_Snap-4b103963bcb7e8cb7417b6f26643c272d0a5d6d0.tar.bz2 android_packages_apps_Snap-4b103963bcb7e8cb7417b6f26643c272d0a5d6d0.zip |
snap: Fix reset of camera controls
* Need to post a runnable so everything currently in the queue
finishes first.
* Also force reset when hiding the preview cover to ensure no
stray scroll events throw us off.
Change-Id: Id1419e91f7624b4276c566228fe77d1a774ecc2b
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/camera/BaseUI.java | 3 | ||||
-rw-r--r-- | src/com/android/camera/ui/CameraControls.java | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/com/android/camera/BaseUI.java b/src/com/android/camera/BaseUI.java index 83ea01550..4dad158d1 100644 --- a/src/com/android/camera/BaseUI.java +++ b/src/com/android/camera/BaseUI.java @@ -109,6 +109,9 @@ public abstract class BaseUI { mPreviewCover.setVisibility(View.GONE); enableOverlays(); } + if (mCameraControls != null) { + mCameraControls.reset(); + } } } } diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index 9d023bbe9..66bf4e010 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -122,7 +122,15 @@ public class CameraControls extends RotatableLayout { return mAnimationHelper.isAnimating(); } - public void reset() { mAnimationHelper.reset(); } + public void reset() { + post(new Runnable() { + @Override + public void run() { + mAnimationHelper.reset(); + enableTouch(true); + } + }); + } private void setChildrenVisibility(ViewGroup parent, boolean visible) { for (int i = 0; i < parent.getChildCount(); i++) { |