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

am 825da76c: Redisplay a hidden button after it entered the screen again.

Browse source 
* commit '825da76c72d420e8c43c7334cf273ba9e5da59fe':
  Redisplay a hidden button after it entered the screen again.
This commit is contained in:
Jean Chalard 2013-04-19 07:06:36 -07:00 committed by Android Git Automerger
commit 6f6974e6e9
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,6 +68,7 @@ public final class WordListPreference extends DialogPreference {
static final private int ANIMATION_OUT = 2; static final private int ANIMATION_OUT = 2;
private static int sLastClickedIndex = NOT_AN_INDEX; private static int sLastClickedIndex = NOT_AN_INDEX;
private static String sLastClickedWordlistId = null;
private final OnWordListPreferenceClick mPreferenceClickHandler = private final OnWordListPreferenceClick mPreferenceClickHandler =
new OnWordListPreferenceClick(); new OnWordListPreferenceClick();
private final OnActionButtonClick mActionButtonClickHandler = private final OnActionButtonClick mActionButtonClickHandler =
@ -199,7 +200,8 @@ public final class WordListPreference extends DialogPreference {
((ViewGroup)view).setLayoutTransition(null); ((ViewGroup)view).setLayoutTransition(null);
final Button button = (Button)view.findViewById(R.id.wordlist_button); final Button button = (Button)view.findViewById(R.id.wordlist_button);
button.setText(getButtonLabel(mStatus)); button.setText(getButtonLabel(mStatus));
button.setVisibility(View.INVISIBLE); // String identity match. This is an ==, not an .equals, on purpose.
button.setVisibility(mWordlistId == sLastClickedWordlistId ? View.VISIBLE : View.INVISIBLE);
button.setOnClickListener(mActionButtonClickHandler); button.setOnClickListener(mActionButtonClickHandler);
view.setOnClickListener(mPreferenceClickHandler); view.setOnClickListener(mPreferenceClickHandler);
} }
@ -218,6 +220,7 @@ public final class WordListPreference extends DialogPreference {
animateButton(getButtonForIndex(listView, sLastClickedIndex), ANIMATION_OUT); animateButton(getButtonForIndex(listView, sLastClickedIndex), ANIMATION_OUT);
} }
sLastClickedIndex = myIndex; sLastClickedIndex = myIndex;
sLastClickedWordlistId = mWordlistId;
} }
} }