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

am 776edcfe: Merge "[PB2] Small bugfix" 

* commit '776edcfe46c59c77fc5ab2b54b9a3dbdc334b6f1':
  [PB2] Small bugfix
main
Jean Chalard 2013-04-24 04:50:51 -07:00 committed by Android Git Automerger
parent 617f99b2d2 776edcfe46
commit e52eb1f706
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
java/src/com/android/inputmethod/dictionarypack/WordListPreference.java
View File

@ -203,19 +203,29 @@ public final class WordListPreference extends Preference {
@Override @Override
public void onClick(final View v) { public void onClick(final View v) {
final Button button = (Button)v.findViewById(R.id.wordlist_button); final Button button = (Button)v.findViewById(R.id.wordlist_button);
animateButton(button, ANIMATION_IN);
final ViewParent parent = v.getParent(); final ViewParent parent = v.getParent();
// Just in case something changed in the framework, test for the concrete class // Just in case something changed in the framework, test for the concrete class
if (!(parent instanceof ListView)) return; if (!(parent instanceof ListView)) return;
final ListView listView = (ListView)parent; final ListView listView = (ListView)parent;
final int myIndex = listView.indexOfChild(v) + listView.getFirstVisiblePosition(); final int myIndex = listView.indexOfChild(v) + listView.getFirstVisiblePosition();
if (NOT_AN_INDEX != sLastClickedIndex) { if (NOT_AN_INDEX != sLastClickedIndex) {
// If another button is showing, hide it
animateButton(getButtonForIndex(listView, sLastClickedIndex), ANIMATION_OUT); animateButton(getButtonForIndex(listView, sLastClickedIndex), ANIMATION_OUT);
} }
if (sLastClickedWordlistId == mWordlistId) {
// This button was being shown. Clear last state to record that there isn't a
// displayed button any more.
sLastClickedIndex = NOT_AN_INDEX;
sLastClickedWordlistId = null;
} else {
// This button was not being shown. Show it and mark it as the latest selected
// button.
animateButton(button, ANIMATION_IN);
sLastClickedIndex = myIndex; sLastClickedIndex = myIndex;
sLastClickedWordlistId = mWordlistId; sLastClickedWordlistId = mWordlistId;
} }
} }
}
private Button getButtonForIndex(final ListView listView, final int index) { private Button getButtonForIndex(final ListView listView, final int index) {
final int indexInChildren = index - listView.getFirstVisiblePosition(); final int indexInChildren = index - listView.getFirstVisiblePosition();