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

Refactor InputMethodSubtypePreference constructor

Browse Source 
Change-Id: I959c0be5ebe4f39ca0b06e3f1b262a10f214c5bd
This commit is contained in:
Tadashi G. Takaoka
2014-07-12 15:46:26 +09:00
parent d3f4618f1d
commit 47a359a7da
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
View File

@@ -267,7 +267,7 @@ public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment {
} }
} else { } else {
final CheckBoxPreference chkbxPref = new InputMethodSubtypePreference( final CheckBoxPreference chkbxPref = new InputMethodSubtypePreference(
context, subtype.getLocale(), mSystemLocale, mCollator); context, subtype, imi, mCollator);
chkbxPref.setKey(imiId + subtype.hashCode()); chkbxPref.setKey(imiId + subtype.hashCode());
chkbxPref.setTitle(subtypeLabel); chkbxPref.setTitle(subtypeLabel);
subtypePreferences.add(chkbxPref); subtypePreferences.add(chkbxPref);

22
src/com/android/settings/inputmethod/InputMethodSubtypePreference.java
View File

@@ -21,8 +21,13 @@ import android.preference.CheckBoxPreference;
import android.preference.Preference; import android.preference.Preference;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodSubtype;
import com.android.internal.inputmethod.InputMethodUtils;
import java.text.Collator; import java.text.Collator;
import java.util.Locale;
/** /**
* Input method subtype preference. * Input method subtype preference.
@@ -37,16 +42,23 @@ class InputMethodSubtypePreference extends CheckBoxPreference {
private final boolean mIsSystemLanguage; private final boolean mIsSystemLanguage;
private final Collator mCollator; private final Collator mCollator;
public InputMethodSubtypePreference( public InputMethodSubtypePreference(final Context context, final InputMethodSubtype subtype,
Context context, String subtypeLocale, String systemLocale, Collator collator) { final InputMethodInfo imi, final Collator collator) {
super(context); super(context);
if (TextUtils.isEmpty(subtypeLocale)) { setKey(imi.getId() + subtype.hashCode());
final CharSequence subtypeLabel = subtype.getDisplayName(context,
imi.getPackageName(), imi.getServiceInfo().applicationInfo);
setTitle(subtypeLabel);
final String subtypeLocaleString = subtype.getLocale();
if (TextUtils.isEmpty(subtypeLocaleString)) {
mIsSystemLocale = false; mIsSystemLocale = false;
mIsSystemLanguage = false; mIsSystemLanguage = false;
} else { } else {
mIsSystemLocale = subtypeLocale.equals(systemLocale); final Locale systemLocale = context.getResources().getConfiguration().locale;
mIsSystemLocale = subtypeLocaleString.equals(systemLocale.toString());
mIsSystemLanguage = mIsSystemLocale mIsSystemLanguage = mIsSystemLocale
|| subtypeLocale.startsWith(systemLocale.substring(0, 2)); || InputMethodUtils.getLanguageFromLocaleString(subtypeLocaleString)
.equals(systemLocale.getLanguage());
} }
mCollator = collator; mCollator = collator;
} }