diff options
| author | Camera Software Integration <camswint@localhost> | 2015-12-08 10:59:36 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-01-06 22:24:58 -0800 |
| commit | f3145bcd8c40c2675a6441fdbb8250e994060a34 (patch) | |
| tree | 4852033044b0ab1b8882e9b8f2e4fd20cbc15e3b /src/com/android/camera/ui | |
| parent | 56d1aaa90301770b117e32dbaf7816df728bf5e7 (diff) | |
| download | android_packages_apps_Snap-f3145bcd8c40c2675a6441fdbb8250e994060a34.tar.gz android_packages_apps_Snap-f3145bcd8c40c2675a6441fdbb8250e994060a34.tar.bz2 android_packages_apps_Snap-f3145bcd8c40c2675a6441fdbb8250e994060a34.zip | |
SnapdragonCamera: Preventing duplicated call of setEnable
Prevent it from calling twice on animation case.
CRs-Fixed: 944874
Change-Id: I96468b627719d48bbd1fc857556dff8f27f46665
Diffstat (limited to 'src/com/android/camera/ui')
| -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 f50ee80c3..dd119ce06 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -493,8 +493,9 @@ public class CameraControls extends RotatableLayout { } public void hideUI() { + if(!isAnimating) + enableTouch(false); isAnimating = true; - enableTouch(false); int rotation = getUnifiedRotation(); mFrontBackSwitcher.animate().cancel(); if(TsMakeupManager.HAS_TS_MAKEUP) { @@ -589,8 +590,9 @@ public class CameraControls extends RotatableLayout { } public void showUI() { + if(!isAnimating) + enableTouch(false); isAnimating = true; - enableTouch(false); int rotation = getUnifiedRotation(); mFrontBackSwitcher.animate().cancel(); if(TsMakeupManager.HAS_TS_MAKEUP) { |