aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/LatinIME.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2013-12-19 20:12:13 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-19 20:12:13 -0800
commit3ae5c14c1841aca4a5f6b62a5567b45a8da63428 (patch)
tree83c02e744870050a2e924ad406ab9fd3816e39be /java/src/com/android/inputmethod/latin/LatinIME.java
parent1516b09c3b7e8ae59d7c64ea93c34fb632827a3a (diff)
parent30e3b66fa3003f9008f8164539bae5540f454cf4 (diff)
downloadlatinime-3ae5c14c1841aca4a5f6b62a5567b45a8da63428.tar.gz
latinime-3ae5c14c1841aca4a5f6b62a5567b45a8da63428.tar.xz
latinime-3ae5c14c1841aca4a5f6b62a5567b45a8da63428.zip
am 30e3b66f: Merge "[IL15] Some small refactoring"
* commit '30e3b66fa3003f9008f8164539bae5540f454cf4': [IL15] Some small refactoring
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index e03687668..e9988bf5b 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1299,8 +1299,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
mUserDictionary.addWordToUserDictionary(wordToEdit);
}
- // TODO[IL]: Rework the route through which this is called.
- public void onSettingsKeyPressed() {
+ public void displaySettingsDialog() {
if (isShowingOptionDialog()) return;
showSubtypeSelectorAndSettings();
}
@@ -2375,7 +2374,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
final CharSequence[] items = new CharSequence[] {
// TODO: Should use new string "Select active input modes".
getString(R.string.language_selection_title),
- getString(ApplicationUtils.getAcitivityTitleResId(this, SettingsActivity.class)),
+ getString(ApplicationUtils.getActivityTitleResId(this, SettingsActivity.class)),
};
final DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() {
@Override