diff options
| author | Jack Yoo <jyoo@codeaurora.org> | 2015-12-08 10:59:36 -0800 |
|---|---|---|
| committer | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2016-01-08 22:50:50 -0800 |
| commit | 4d7ad55a12e15542ec4825902ca6fe50d01df330 (patch) | |
| tree | 09fd476b4cedb4258a778c757e37940f1dbbc3e5 | |
| parent | a675b2cf0ebd34d180c88e43a0f38d80b22f351d (diff) | |
| download | android_packages_apps_Snap-4d7ad55a12e15542ec4825902ca6fe50d01df330.tar.gz android_packages_apps_Snap-4d7ad55a12e15542ec4825902ca6fe50d01df330.tar.bz2 android_packages_apps_Snap-4d7ad55a12e15542ec4825902ca6fe50d01df330.zip | |
SnapdragonCamera: Preventing duplicated call of setEnable
Prevent it from calling twice on animation case.
CRs-Fixed: 944874
Change-Id: I96468b627719d48bbd1fc857556dff8f27f46665
| -rw-r--r-- | src/com/android/camera/ui/CameraControls.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index 59222b929..dd769e8e3 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -422,8 +422,9 @@ public class CameraControls extends RotatableLayout { } public void hideUI() { + if(!isAnimating) + enableTouch(false); isAnimating = true; - enableTouch(false); int rotation = getUnifiedRotation(); mFrontBackSwitcher.animate().cancel(); mHdrSwitcher.animate().cancel(); @@ -493,8 +494,9 @@ public class CameraControls extends RotatableLayout { } public void showUI() { + if(!isAnimating) + enableTouch(false); isAnimating = true; - enableTouch(false); int rotation = getUnifiedRotation(); mFrontBackSwitcher.animate().cancel(); mHdrSwitcher.animate().cancel(); |