Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 724db044 authored by Ken Wakasa's avatar Ken Wakasa
Browse files

Deallocate gesture trail bitmap when unneeded further 

Follow up to I5bc980c4dc41bc304be3c190934c1f7c55c9d244

bug: 8967766
Change-Id: I7b916daa5269cfde359a77555e8ffadf0e4a8f92
parent 5c057b32

java/src/com/android/inputmethod/keyboard/MainKeyboardView.java

+10 −6
Original line number Diff line number Diff line
@@ -838,10 +838,10 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack 
        mSlidingKeyInputPreview.dismissSlidingKeyInputPreview();

    }



    public void setGesturePreviewMode(final boolean drawsGestureTrail,

            final boolean drawsGestureFloatingPreviewText) {

        mGestureFloatingPreviewText.setPreviewEnabled(drawsGestureFloatingPreviewText);

        mGestureTrailsPreview.setPreviewEnabled(drawsGestureTrail);

    private void setGesturePreviewMode(final boolean isGestureTrailEnabled,

            final boolean isGestureFloatingPreviewTextEnabled) {

        mGestureFloatingPreviewText.setPreviewEnabled(isGestureFloatingPreviewTextEnabled);

        mGestureTrailsPreview.setPreviewEnabled(isGestureTrailEnabled);

    }



    public void showGestureFloatingPreviewText(final SuggestedWords suggestedWords) {
@@ -869,8 +869,12 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack 
        PointerTracker.setMainDictionaryAvailability(mainDictionaryAvailable);

    }



    public void setGestureHandlingEnabledByUser(final boolean gestureHandlingEnabledByUser) {

        PointerTracker.setGestureHandlingEnabledByUser(gestureHandlingEnabledByUser);

    public void setGestureHandlingEnabledByUser(final boolean isGestureHandlingEnabledByUser,

            final boolean isGestureTrailEnabled,

            final boolean isGestureFloatingPreviewTextEnabled) {

        PointerTracker.setGestureHandlingEnabledByUser(isGestureHandlingEnabledByUser);

        setGesturePreviewMode(isGestureHandlingEnabledByUser && isGestureTrailEnabled,

                isGestureHandlingEnabledByUser && isGestureFloatingPreviewTextEnabled);

    }



    @Override

java/src/com/android/inputmethod/latin/LatinIME.java

+2 −2
Original line number Diff line number Diff line
@@ -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

java/src/com/android/inputmethod/latin/settings/SettingsValues.java

+2 −2
Original line number Diff line number Diff line
@@ -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;