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

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

* commit '4e61cf7162c565e71e3aeb1a23d1b4f716392fa4':
  [PB9] Make buttons that animate-out unclickable
main
Jean Chalard 2013-05-15 11:05:17 -07:00 committed by Android Git Automerger
parent 95abe990e3 4e61cf7162
commit 605e28c189
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() { new AnimatorListenerAdapter() {
@Override @Override
public void onAnimationEnd(final Animator animation) { public void onAnimationEnd(final Animator animation) {
if (newStatus != mStatus) return;
animateButton(newButton, ANIMATION_IN); animateButton(newButton, ANIMATION_IN);
} }
}); });
@ -144,8 +145,10 @@ public class ButtonSwitcher extends FrameLayout {
final float outerX = getWidth(); final float outerX = getWidth();
final float innerX = button.getX() - button.getTranslationX(); final float innerX = button.getX() - button.getTranslationX();
if (ANIMATION_IN == direction) { if (ANIMATION_IN == direction) {
button.setClickable(true);
return button.animate().translationX(0); return button.animate().translationX(0);
} else { } else {
button.setClickable(false);
return button.animate().translationX(outerX - innerX); 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 ListView listView = (ListView)parent;
final int indexToOpen; final int indexToOpen;
// Close all first, we'll open back any item that needs to be open. // Close all first, we'll open back any item that needs to be open.
final boolean wasOpen = mInterfaceState.isOpen(mWordlistId);
mInterfaceState.closeAll(); 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 // This button being shown. Take note that we don't want to open any button in the
// loop below. // loop below.
indexToOpen = -1; indexToOpen = -1;