summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2013-10-15 14:54:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-15 14:54:09 -0700
commit4baeda1f643005e11cd2bb4b1103fe487f95ec66 (patch)
treec2ef0f165fba6a1ce0b244f95aff6b5a8256b3df
parent6cf14f191d4f590ef564f113856ae6e46704f0ed (diff)
parent5e82f81a7c7daaf8ac86dbd688b344027f97ff64 (diff)
downloadandroid_packages_apps_Snap-4baeda1f643005e11cd2bb4b1103fe487f95ec66.tar.gz
android_packages_apps_Snap-4baeda1f643005e11cd2bb4b1103fe487f95ec66.tar.bz2
android_packages_apps_Snap-4baeda1f643005e11cd2bb4b1103fe487f95ec66.zip
am 5e82f81a: Merge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-photos-carlsbad
* commit '5e82f81a7c7daaf8ac86dbd688b344027f97ff64': gcam: Fix AF spinner not to reset when changing position
-rw-r--r--src/com/android/camera/ui/PieRenderer.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/ui/PieRenderer.java b/src/com/android/camera/ui/PieRenderer.java
index 666fa13b1..3967f7946 100644
--- a/src/com/android/camera/ui/PieRenderer.java
+++ b/src/com/android/camera/ui/PieRenderer.java
@@ -905,6 +905,7 @@ public class PieRenderer extends OverlayRenderer
}
public void setFocus(int x, int y) {
+ mOverlay.removeCallbacks(mDisappear);
mFocusX = x;
mFocusY = y;
setCircle(mFocusX, mFocusY);