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

Merge "Omit InputMethodManagerCompatWrapper argument from some utility methods"

main
Tadashi G. Takaoka 2012-03-04 18:12:47 -08:00 committed by Android (Google) Code Review
parent c2136c4e63 2d25ba2750
commit 49079df8ec
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java
View File

@ -150,7 +150,7 @@ public class InputMethodManagerCompatWrapper {
private InputMethodInfoCompatWrapper getLatinImeInputMethodInfo() { private InputMethodInfoCompatWrapper getLatinImeInputMethodInfo() {
if (TextUtils.isEmpty(mLatinImePackageName)) if (TextUtils.isEmpty(mLatinImePackageName))
return null; return null;
return Utils.getInputMethodInfo(this, mLatinImePackageName); return Utils.getInputMethodInfo(mLatinImePackageName);
} }
private static InputMethodSubtypeCompatWrapper getLastResortSubtype(String mode) { private static InputMethodSubtypeCompatWrapper getLastResortSubtype(String mode) {
@ -239,8 +239,7 @@ public class InputMethodManagerCompatWrapper {
// The code below are based on {@link InputMethodManager#showInputMethodMenuInternal}. // The code below are based on {@link InputMethodManager#showInputMethodMenuInternal}.
final InputMethodInfoCompatWrapper myImi = Utils.getInputMethodInfo( final InputMethodInfoCompatWrapper myImi = Utils.getInputMethodInfo(mLatinImePackageName);
this, mLatinImePackageName);
final List<InputMethodSubtypeCompatWrapper> myImsList = getEnabledInputMethodSubtypeList( final List<InputMethodSubtypeCompatWrapper> myImsList = getEnabledInputMethodSubtypeList(
myImi, true); myImi, true);
final InputMethodSubtypeCompatWrapper currentIms = getCurrentInputMethodSubtype(); final InputMethodSubtypeCompatWrapper currentIms = getCurrentInputMethodSubtype();

2
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -2420,7 +2420,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
switch (position) { switch (position) {
case 0: case 0:
Intent intent = CompatUtils.getInputLanguageSelectionIntent( Intent intent = CompatUtils.getInputLanguageSelectionIntent(
Utils.getInputMethodId(mImm, getPackageName()), Utils.getInputMethodId(getPackageName()),
Intent.FLAG_ACTIVITY_NEW_TASK Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
| Intent.FLAG_ACTIVITY_CLEAR_TOP); | Intent.FLAG_ACTIVITY_CLEAR_TOP);

7
java/src/com/android/inputmethod/latin/Settings.java
View File

@ -329,10 +329,9 @@ public class Settings extends InputMethodSettingsActivity
@Override @Override
public boolean onPreferenceClick(Preference pref) { public boolean onPreferenceClick(Preference pref) {
if (pref == mInputLanguageSelection) { if (pref == mInputLanguageSelection) {
startActivity(CompatUtils.getInputLanguageSelectionIntent( final String imeId = Utils.getInputMethodId(
Utils.getInputMethodId( getActivityInternal().getApplicationInfo().packageName);
InputMethodManagerCompatWrapper.getInstance(), startActivity(CompatUtils.getInputLanguageSelectionIntent(imeId, 0));
getActivityInternal().getApplicationInfo().packageName), 0));
return true; return true;
} }
return false; return false;

12
java/src/com/android/inputmethod/latin/Utils.java
View File

@ -171,12 +171,16 @@ public class Utils {
return keyboardCount > 1; return keyboardCount > 1;
} }
public static String getInputMethodId(InputMethodManagerCompatWrapper imm, String packageName) { public static String getInputMethodId(String packageName) {
return getInputMethodInfo(imm, packageName).getId(); return getInputMethodInfo(packageName).getId();
} }
public static InputMethodInfoCompatWrapper getInputMethodInfo( public static InputMethodInfoCompatWrapper getInputMethodInfo(String packageName) {
InputMethodManagerCompatWrapper imm, String packageName) { final InputMethodManagerCompatWrapper imm = InputMethodManagerCompatWrapper.getInstance();
if (imm == null) {
throw new RuntimeException("Input method manager not found");
}
for (final InputMethodInfoCompatWrapper imi : imm.getEnabledInputMethodList()) { for (final InputMethodInfoCompatWrapper imi : imm.getEnabledInputMethodList()) {
if (imi.getPackageName().equals(packageName)) if (imi.getPackageName().equals(packageName))
return imi; return imi;