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

Commit 883bd364 authored by Ken Wakasa's avatar Ken Wakasa Committed by Android (Google) Code Review
Browse files

Merge "Deallocate gesture trail bitmap when unneeded"

parents 3b1eb886 c8814e20

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -1370,4 +1370,8 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack 
            drawIcon(canvas, mSpaceIcon, x, y, iconWidth, iconHeight);

            drawIcon(canvas, mSpaceIcon, x, y, iconWidth, iconHeight);

        }

        }

    }

    }



    public void deallocateMemory() {

        mGestureTrailsPreview.deallocateMemory();

    }

}
 
}

java/src/com/android/inputmethod/keyboard/internal/GestureTrailsPreview.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -104,7 +104,12 @@ public final class GestureTrailsPreview extends AbstractDrawingPreview { 
        freeOffscreenBuffer();

        freeOffscreenBuffer();

    }

    }





    public void deallocateMemory() {

        freeOffscreenBuffer();

    }



    private void freeOffscreenBuffer() {

    private void freeOffscreenBuffer() {

        mOffscreenCanvas.setBitmap(null);

        if (mOffscreenBuffer != null) {

        if (mOffscreenBuffer != null) {

            mOffscreenBuffer.recycle();

            mOffscreenBuffer.recycle();

            mOffscreenBuffer = null;

            mOffscreenBuffer = null;

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -894,6 +894,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
        final MainKeyboardView mainKeyboardView = mKeyboardSwitcher.getMainKeyboardView();

        final MainKeyboardView mainKeyboardView = mKeyboardSwitcher.getMainKeyboardView();

        if (mainKeyboardView != null) {

        if (mainKeyboardView != null) {

            mainKeyboardView.cancelAllOngoingEvents();

            mainKeyboardView.cancelAllOngoingEvents();

            mainKeyboardView.deallocateMemory();

        }

        }

        // Remove pending messages related to update suggestions

        // Remove pending messages related to update suggestions

        mHandler.cancelUpdateSuggestionStrip();

        mHandler.cancelUpdateSuggestionStrip();