aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/dictionarypack/ButtonSwitcher.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2013-04-24 18:21:44 +0900
committerJean Chalard <jchalard@google.com>2013-04-26 19:06:29 +0900
commitd4fc13d261c77b3ccf6847e69d28cb2da583fd5c (patch)
tree408bcee7212029bd01686ceaf74f03af7c0c8fd6 /java/src/com/android/inputmethod/dictionarypack/ButtonSwitcher.java
parente8ed5d88763ce495ba36e7f7b8b334d75f211a2a (diff)
downloadlatinime-d4fc13d261c77b3ccf6847e69d28cb2da583fd5c.tar.gz
latinime-d4fc13d261c77b3ccf6847e69d28cb2da583fd5c.tar.xz
latinime-d4fc13d261c77b3ccf6847e69d28cb2da583fd5c.zip
[PB9] Make buttons that animate-out unclickable
Clicking on a button that is animating-out is only done by mistake. Better make them unclickable. Also, interrupt an out-in animation if it has been preempted. Bug: 7600384 Change-Id: Ic4700cda46a894ea580bc67ee7bef885ecf1d3bc
Diffstat (limited to 'java/src/com/android/inputmethod/dictionarypack/ButtonSwitcher.java')
-rw-r--r--java/src/com/android/inputmethod/dictionarypack/ButtonSwitcher.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/dictionarypack/ButtonSwitcher.java b/java/src/com/android/inputmethod/dictionarypack/ButtonSwitcher.java
index 391a15c97..5ab94a429 100644
--- a/java/src/com/android/inputmethod/dictionarypack/ButtonSwitcher.java
+++ b/java/src/com/android/inputmethod/dictionarypack/ButtonSwitcher.java
@@ -126,6 +126,7 @@ public class ButtonSwitcher extends FrameLayout {
new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(final Animator animation) {
+ if (newStatus != mStatus) return;
animateButton(newButton, ANIMATION_IN);
}
});
@@ -144,8 +145,10 @@ public class ButtonSwitcher extends FrameLayout {
final float outerX = getWidth();
final float innerX = button.getX() - button.getTranslationX();
if (ANIMATION_IN == direction) {
+ button.setClickable(true);
return button.animate().translationX(0);
} else {
+ button.setClickable(false);
return button.animate().translationX(outerX - innerX);
}
}