From 4b103963bcb7e8cb7417b6f26643c272d0a5d6d0 Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Sun, 20 Nov 2016 03:07:22 -0800
Subject: 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
---
 src/com/android/camera/BaseUI.java            |  3 +++
 src/com/android/camera/ui/CameraControls.java | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

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++) {
-- 
cgit v1.2.3