aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2013-12-20 01:53:26 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-20 01:53:26 -0800
commit42e932beba7789a3f02c14cb432545c9e9162fa9 (patch)
treef05329e74d5d07fd796327d5af86853ea37536f0
parent4ce971ea6f370c2e6902e23e219cd6f4361282c6 (diff)
parentec4b6e7bb37d2f1794673dc896c14d6b554c6a0a (diff)
downloadlatinime-42e932beba7789a3f02c14cb432545c9e9162fa9.tar.gz
latinime-42e932beba7789a3f02c14cb432545c9e9162fa9.tar.xz
latinime-42e932beba7789a3f02c14cb432545c9e9162fa9.zip
am ec4b6e7b: [IL25] Inline handleClose
* commit 'ec4b6e7bb37d2f1794673dc896c14d6b554c6a0a': [IL25] Inline handleClose
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java18
1 files changed, 6 insertions, 12 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index f97510b46..c66fca58c 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1609,17 +1609,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
mInputUpdater.onCancelBatchInput();
}
- // TODO[IL]: Rename this to avoid using handle*
- private void handleClose() {
- // TODO: Verify that words are logged properly when IME is closed.
- mInputLogic.commitTyped(mSettings.getCurrent(), LastComposedWord.NOT_A_SEPARATOR);
- requestHideSelf(0);
- final MainKeyboardView mainKeyboardView = mKeyboardSwitcher.getMainKeyboardView();
- if (mainKeyboardView != null) {
- mainKeyboardView.closing();
- }
- }
-
// TODO[IL]: Move this to InputLogic and make it private
// Outside LatinIME, only used by the test suite.
@UsedForTesting
@@ -2170,7 +2159,12 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
};
private void launchSettings() {
- handleClose();
+ mInputLogic.commitTyped(mSettings.getCurrent(), LastComposedWord.NOT_A_SEPARATOR);
+ requestHideSelf(0);
+ final MainKeyboardView mainKeyboardView = mKeyboardSwitcher.getMainKeyboardView();
+ if (mainKeyboardView != null) {
+ mainKeyboardView.closing();
+ }
launchSubActivity(SettingsActivity.class);
}