Merge "Omit InputMethodManagerCompatWrapper argument from some utility methods"
commit
49079df8ec
|
@ -150,7 +150,7 @@ public class InputMethodManagerCompatWrapper {
|
|||
private InputMethodInfoCompatWrapper getLatinImeInputMethodInfo() {
|
||||
if (TextUtils.isEmpty(mLatinImePackageName))
|
||||
return null;
|
||||
return Utils.getInputMethodInfo(this, mLatinImePackageName);
|
||||
return Utils.getInputMethodInfo(mLatinImePackageName);
|
||||
}
|
||||
|
||||
private static InputMethodSubtypeCompatWrapper getLastResortSubtype(String mode) {
|
||||
|
@ -239,8 +239,7 @@ public class InputMethodManagerCompatWrapper {
|
|||
|
||||
// The code below are based on {@link InputMethodManager#showInputMethodMenuInternal}.
|
||||
|
||||
final InputMethodInfoCompatWrapper myImi = Utils.getInputMethodInfo(
|
||||
this, mLatinImePackageName);
|
||||
final InputMethodInfoCompatWrapper myImi = Utils.getInputMethodInfo(mLatinImePackageName);
|
||||
final List<InputMethodSubtypeCompatWrapper> myImsList = getEnabledInputMethodSubtypeList(
|
||||
myImi, true);
|
||||
final InputMethodSubtypeCompatWrapper currentIms = getCurrentInputMethodSubtype();
|
||||
|
|
|
@ -2420,7 +2420,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
|
|||
switch (position) {
|
||||
case 0:
|
||||
Intent intent = CompatUtils.getInputLanguageSelectionIntent(
|
||||
Utils.getInputMethodId(mImm, getPackageName()),
|
||||
Utils.getInputMethodId(getPackageName()),
|
||||
Intent.FLAG_ACTIVITY_NEW_TASK
|
||||
| Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
|
||||
| Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||
|
|
|
@ -329,10 +329,9 @@ public class Settings extends InputMethodSettingsActivity
|
|||
@Override
|
||||
public boolean onPreferenceClick(Preference pref) {
|
||||
if (pref == mInputLanguageSelection) {
|
||||
startActivity(CompatUtils.getInputLanguageSelectionIntent(
|
||||
Utils.getInputMethodId(
|
||||
InputMethodManagerCompatWrapper.getInstance(),
|
||||
getActivityInternal().getApplicationInfo().packageName), 0));
|
||||
final String imeId = Utils.getInputMethodId(
|
||||
getActivityInternal().getApplicationInfo().packageName);
|
||||
startActivity(CompatUtils.getInputLanguageSelectionIntent(imeId, 0));
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
|
@ -171,12 +171,16 @@ public class Utils {
|
|||
return keyboardCount > 1;
|
||||
}
|
||||
|
||||
public static String getInputMethodId(InputMethodManagerCompatWrapper imm, String packageName) {
|
||||
return getInputMethodInfo(imm, packageName).getId();
|
||||
public static String getInputMethodId(String packageName) {
|
||||
return getInputMethodInfo(packageName).getId();
|
||||
}
|
||||
|
||||
public static InputMethodInfoCompatWrapper getInputMethodInfo(String packageName) {
|
||||
final InputMethodManagerCompatWrapper imm = InputMethodManagerCompatWrapper.getInstance();
|
||||
if (imm == null) {
|
||||
throw new RuntimeException("Input method manager not found");
|
||||
}
|
||||
|
||||
public static InputMethodInfoCompatWrapper getInputMethodInfo(
|
||||
InputMethodManagerCompatWrapper imm, String packageName) {
|
||||
for (final InputMethodInfoCompatWrapper imi : imm.getEnabledInputMethodList()) {
|
||||
if (imi.getPackageName().equals(packageName))
|
||||
return imi;
|
||||
|
|
Loading…
Reference in New Issue