nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

am 739406bf: Merge "[PB9] Make buttons that animate-out unclickable"

Browse source 
* commit '739406bf468446297b526866f5bf4be70b2cbc95':
  [PB9] Make buttons that animate-out unclickable
This commit is contained in:
Jean Chalard 2013-04-26 03:32:11 -07:00 committed by Android Git Automerger
commit 4e61cf7162
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
java/src/com/android/inputmethod/dictionarypack/ButtonSwitcher.java
View file

@ -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);
}
}

3
java/src/com/android/inputmethod/dictionarypack/WordListPreference.java
View file

@ -219,8 +219,9 @@ public final class WordListPreference extends Preference {
final ListView listView = (ListView)parent;
final int indexToOpen;
// Close all first, we'll open back any item that needs to be open.
final boolean wasOpen = mInterfaceState.isOpen(mWordlistId);
mInterfaceState.closeAll();
if (mInterfaceState.isOpen(mWordlistId)) {
if (wasOpen) {
// This button being shown. Take note that we don't want to open any button in the
// loop below.
indexToOpen = -1;