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

am ec4b6e7b: [IL25] Inline handleClose 

* commit 'ec4b6e7bb37d2f1794673dc896c14d6b554c6a0a':
  [IL25] Inline handleClose
main
Jean Chalard 2013-12-20 01:53:26 -08:00 committed by Android Git Automerger
parent 4ce971ea6f ec4b6e7bb3
commit 42e932beba
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1609,17 +1609,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
mInputUpdater.onCancelBatchInput(); 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 // TODO[IL]: Move this to InputLogic and make it private
// Outside LatinIME, only used by the test suite. // Outside LatinIME, only used by the test suite.
@UsedForTesting @UsedForTesting
@ -2170,7 +2159,12 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
}; };
private void launchSettings() { 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); launchSubActivity(SettingsActivity.class);
} }