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

am b4b3e80f: Merge "Fix empty custom input style entry appears after orientation change" into jb-dev 

* commit 'b4b3e80f1124eaefc4218fbd03a2af2dc4fece17':
  Fix empty custom input style entry appears after orientation change
main
Tadashi G. Takaoka 2012-05-15 11:37:56 -07:00 committed by Android Git Automerger
parent edcc32802f b4b3e80f11
commit fcb81e3171
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java
View File

@ -131,6 +131,7 @@ public class AdditionalSubtypeSettings extends PreferenceFragment {
private interface SubtypeDialogProxy {
public void onRemovePressed(SubtypePreference subtypePref);
public void onAddPressed(SubtypePreference subtypePref);
public SubtypeLocaleAdapter getSubtypeLocaleAdapter();
public KeyboardLayoutSetAdapter getKeyboardLayoutSetAdapter();
}
@ -241,6 +242,7 @@ public class AdditionalSubtypeSettings extends PreferenceFragment {
super.onClick(dialog, which);
switch (which) {
case DialogInterface.BUTTON_POSITIVE:
final boolean addPressed = isIncomplete();
final SubtypeLocaleItem locale =
(SubtypeLocaleItem) mSubtypeLocaleSpinner.getSelectedItem();
final KeyboardLayoutSetItem layout =
@ -249,6 +251,9 @@ public class AdditionalSubtypeSettings extends PreferenceFragment {
locale.first, layout.first, ASCII_CAPABLE);
setSubtype(subtype);
notifyChanged();
if (addPressed) {
mProxy.onAddPressed(this);
}
break;
case DialogInterface.BUTTON_NEUTRAL:
// Nothing to do
@ -390,6 +395,11 @@ public class AdditionalSubtypeSettings extends PreferenceFragment {
}
}
@Override
public void onAddPressed(SubtypePreference subtypePref) {
mIsAddingNewSubtype = false;
}
@Override
public SubtypeLocaleAdapter getSubtypeLocaleAdapter() {
return mSubtypeLocaleAdapter;