summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2010-04-21 00:03:38 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-04-21 00:03:38 -0700
commite5864ac46b5a776c29d6b5a47b14c6fa13070d59 (patch)
tree82c37d7432267bde31d6cb09cf37e87b2ebe65b3 /src/com
parent523432315cea8f18d703a0d547b4614ce42b6918 (diff)
parent5e511f8bfe4ef16bcd4619d08eddad48f0f0deef (diff)
downloadLegacyCamera-e5864ac46b5a776c29d6b5a47b14c6fa13070d59.zip
LegacyCamera-e5864ac46b5a776c29d6b5a47b14c6fa13070d59.tar.gz
LegacyCamera-e5864ac46b5a776c29d6b5a47b14c6fa13070d59.tar.bz2
Merge "Fix bug: 2609027." into froyo
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/camera/Switcher.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/Switcher.java b/src/com/android/camera/Switcher.java
index 342f0d6..c88ddb8 100644
--- a/src/com/android/camera/Switcher.java
+++ b/src/com/android/camera/Switcher.java
@@ -157,7 +157,7 @@ public class Switcher extends ImageView implements View.OnTouchListener {
} else {
mAnimationStartTime = NO_ANIMATION;
}
- } else {
+ } else if (!isPressed()){
mPosition = mSwitch ? available : 0;
}
int offsetTop = getPaddingTop() + mPosition;