aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2013-10-09 21:26:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-09 21:26:39 -0700
commit2163a48d860dffb0dd97473a086586ea1781f48c (patch)
tree81da3a354ffef1f4d29251190253ea19ab896d64 /java/src/com/android/inputmethod/latin
parent5ff266e0b1d6fa1cc2b196c98ee0ed5d79e72a34 (diff)
parent302102ee532ed23af17942c7bd8cc8238ce29559 (diff)
downloadlatinime-2163a48d860dffb0dd97473a086586ea1781f48c.tar.gz
latinime-2163a48d860dffb0dd97473a086586ea1781f48c.tar.xz
latinime-2163a48d860dffb0dd97473a086586ea1781f48c.zip
am 302102ee: am db7513bb: am a701501c: Merge "Reduce memory of emoji palette"
* commit '302102ee532ed23af17942c7bd8cc8238ce29559': Reduce memory of emoji palette
Diffstat (limited to 'java/src/com/android/inputmethod/latin')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index bdf7a9d29..ccdbd0d4d 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1050,11 +1050,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
private void onFinishInputViewInternal(final boolean finishingInput) {
super.onFinishInputView(finishingInput);
mKeyboardSwitcher.onFinishInputView();
- final MainKeyboardView mainKeyboardView = mKeyboardSwitcher.getMainKeyboardView();
- if (mainKeyboardView != null) {
- mainKeyboardView.cancelAllOngoingEvents();
- mainKeyboardView.deallocateMemory();
- }
+ mKeyboardSwitcher.deallocateMemory();
// Remove pending messages related to update suggestions
mHandler.cancelUpdateSuggestionStrip();
// Should do the following in onFinishInputInternal but until JB MR2 it's not called :(