diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-08-09 15:21:44 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-08-09 15:21:44 -0700 |
| commit | 25402fd5309891884a843528d47f6b4646341a3f (patch) | |
| tree | d9c55217d0a649bd023fb089825b6cddbe371373 /java/src/com/android/inputmethod/latin | |
| parent | 6d2399c003264581218913ef48d47732d6eb0a01 (diff) | |
| parent | 724db044957eb3544323c9814cbb4f20e81b8594 (diff) | |
| download | latinime-25402fd5309891884a843528d47f6b4646341a3f.tar.gz latinime-25402fd5309891884a843528d47f6b4646341a3f.tar.xz latinime-25402fd5309891884a843528d47f6b4646341a3f.zip | |
am 724db044: Deallocate gesture trail bitmap when unneeded further
* commit '724db044957eb3544323c9814cbb4f20e81b8594':
Deallocate gesture trail bitmap when unneeded further
Diffstat (limited to '')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/SettingsValues.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 6339e9c50..5c5b7b7c0 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -846,8 +846,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen mainKeyboardView.setSlidingKeyInputPreviewEnabled( currentSettingsValues.mSlidingKeyInputPreviewEnabled); mainKeyboardView.setGestureHandlingEnabledByUser( - currentSettingsValues.mGestureInputEnabled); - mainKeyboardView.setGesturePreviewMode(currentSettingsValues.mGesturePreviewTrailEnabled, + currentSettingsValues.mGestureInputEnabled, + currentSettingsValues.mGestureTrailEnabled, currentSettingsValues.mGestureFloatingPreviewTextEnabled); // If we have a user dictionary addition in progress, we should check now if we should diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java index 8aafb0738..a25cf620c 100644 --- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java @@ -71,7 +71,7 @@ public final class SettingsValues { // Use bigrams to predict the next word when there is no input for it yet public final boolean mBigramPredictionEnabled; public final boolean mGestureInputEnabled; - public final boolean mGesturePreviewTrailEnabled; + public final boolean mGestureTrailEnabled; public final boolean mGestureFloatingPreviewTextEnabled; public final boolean mSlidingKeyInputPreviewEnabled; public final int mKeyLongpressTimeout; @@ -157,7 +157,7 @@ public final class SettingsValues { mVoiceKeyEnabled = mVoiceMode != null && !mVoiceMode.equals(voiceModeOff); mVoiceKeyOnMain = mVoiceMode != null && mVoiceMode.equals(voiceModeMain); mGestureInputEnabled = Settings.readGestureInputEnabled(prefs, res); - mGesturePreviewTrailEnabled = prefs.getBoolean(Settings.PREF_GESTURE_PREVIEW_TRAIL, true); + mGestureTrailEnabled = prefs.getBoolean(Settings.PREF_GESTURE_PREVIEW_TRAIL, true); mGestureFloatingPreviewTextEnabled = prefs.getBoolean( Settings.PREF_GESTURE_FLOATING_PREVIEW_TEXT, true); mCorrectionEnabled = mAutoCorrectEnabled && !mInputAttributes.mInputTypeNoAutoCorrect; |