aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/Settings.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-03-04 18:12:47 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-04 18:12:47 -0800
commit49079df8ec95dfaf6d202648731367303f92acae (patch)
tree36babe8dc00083aa9aa50ce7b5276c52ed3407fb /java/src/com/android/inputmethod/latin/Settings.java
parentc2136c4e632d4542cd806d7b91a4504c11a04768 (diff)
parent2d25ba27506fe209c63b4d7b7059d1c2525e231a (diff)
downloadlatinime-49079df8ec95dfaf6d202648731367303f92acae.tar.gz
latinime-49079df8ec95dfaf6d202648731367303f92acae.tar.xz
latinime-49079df8ec95dfaf6d202648731367303f92acae.zip
Merge "Omit InputMethodManagerCompatWrapper argument from some utility methods"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/Settings.java')
-rw-r--r--java/src/com/android/inputmethod/latin/Settings.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java
index dfcb6450e..3029057be 100644
--- a/java/src/com/android/inputmethod/latin/Settings.java
+++ b/java/src/com/android/inputmethod/latin/Settings.java
@@ -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;