PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reset selected InputMethodSubtype when the checkbox for the selected InputMethodSubtype was disabled"

Browse Source
This commit is contained in:
satok
2010-11-03 23:09:52 -07:00
committed by Android (Google) Code Review
parent f3cd94652f 23bdc18843
commit 897e9df8e6
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
View File

@@ -48,15 +48,19 @@ public class InputMethodAndSubtypeUtil {
private static final TextUtils.SimpleStringSplitter sStringInputMethodSubtypeSplitter private static final TextUtils.SimpleStringSplitter sStringInputMethodSubtypeSplitter
= new TextUtils.SimpleStringSplitter(INPUT_METHOD_SUBTYPE_SEPARATER); = new TextUtils.SimpleStringSplitter(INPUT_METHOD_SUBTYPE_SEPARATER);
private static boolean isInputMethodSubtypeSelected(ContentResolver resolver) { private static int getInputMethodSubtypeSelected(ContentResolver resolver) {
try { try {
return Settings.Secure.getInt(resolver, return Settings.Secure.getInt(resolver,
Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE) != NOT_A_SUBTYPE_ID; Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE);
} catch (SettingNotFoundException e) { } catch (SettingNotFoundException e) {
return false; return NOT_A_SUBTYPE_ID;
} }
} }
private static boolean isInputMethodSubtypeSelected(ContentResolver resolver) {
return getInputMethodSubtypeSelected(resolver) != NOT_A_SUBTYPE_ID;
}
private static void putSelectedInputMethodSubtype(ContentResolver resolver, int hashCode) { private static void putSelectedInputMethodSubtype(ContentResolver resolver, int hashCode) {
Settings.Secure.putInt(resolver, Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE, hashCode); Settings.Secure.putInt(resolver, Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE, hashCode);
} }
@@ -98,6 +102,7 @@ public class InputMethodAndSubtypeUtil {
boolean hasHardKeyboard, String lastTickedInputMethodId) { boolean hasHardKeyboard, String lastTickedInputMethodId) {
String currentInputMethodId = Settings.Secure.getString(resolver, String currentInputMethodId = Settings.Secure.getString(resolver,
Settings.Secure.DEFAULT_INPUT_METHOD); Settings.Secure.DEFAULT_INPUT_METHOD);
final int selectedInputMethodSubtype = getInputMethodSubtypeSelected(resolver);
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
StringBuilder disabledSysImes = new StringBuilder(); StringBuilder disabledSysImes = new StringBuilder();
@@ -105,6 +110,7 @@ public class InputMethodAndSubtypeUtil {
int firstSubtypeHashCode = NOT_A_SUBTYPE_ID; int firstSubtypeHashCode = NOT_A_SUBTYPE_ID;
final boolean onlyOneIME = inputMethodProperties.size() == 1; final boolean onlyOneIME = inputMethodProperties.size() == 1;
boolean existsSelectedIME = false;
for (InputMethodInfo property : inputMethodProperties) { for (InputMethodInfo property : inputMethodProperties) {
final String id = property.getId(); final String id = property.getId();
CheckBoxPreference pref = (CheckBoxPreference) context.findPreference(id); CheckBoxPreference pref = (CheckBoxPreference) context.findPreference(id);
@@ -123,8 +129,12 @@ public class InputMethodAndSubtypeUtil {
id + subtype.hashCode()); id + subtype.hashCode());
if (subtypePref != null && subtypePref.isChecked()) { if (subtypePref != null && subtypePref.isChecked()) {
builder.append(INPUT_METHOD_SUBTYPE_SEPARATER).append(subtype.hashCode()); builder.append(INPUT_METHOD_SUBTYPE_SEPARATER).append(subtype.hashCode());
if (firstSubtypeHashCode == NOT_A_SUBTYPE_ID) { if (isCurrentInputMethod) {
firstSubtypeHashCode = subtype.hashCode(); if (selectedInputMethodSubtype == subtype.hashCode()) {
existsSelectedIME = true;
} else if (firstSubtypeHashCode == NOT_A_SUBTYPE_ID) {
firstSubtypeHashCode = subtype.hashCode();
}
} }
} }
} }
@@ -158,9 +168,10 @@ public class InputMethodAndSubtypeUtil {
Log.d(TAG, "--- Save default inputmethod settings. :" + currentInputMethodId); Log.d(TAG, "--- Save default inputmethod settings. :" + currentInputMethodId);
} }
// redefines SelectedSubtype when all subtypes are unchecked or there is no subtype // Redefines SelectedSubtype when all subtypes are unchecked or there is no subtype
// selected. // selected. And if the selected subtype of the current input method was disabled,
if (firstSubtypeHashCode == NOT_A_SUBTYPE_ID || !isInputMethodSubtypeSelected(resolver)) { // We should reset the selected input method's subtype.
if (!existsSelectedIME || !isInputMethodSubtypeSelected(resolver)) {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "--- Set inputmethod subtype because it's not defined." Log.d(TAG, "--- Set inputmethod subtype because it's not defined."
+ firstSubtypeHashCode); + firstSubtypeHashCode);