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

Commit ac4ec539 authored by Ken Wakasa's avatar Ken Wakasa Committed by Android Git Automerger
Browse files

am 883bd364: Merge "Deallocate gesture trail bitmap when unneeded" 

* commit '883bd364':
  Deallocate gesture trail bitmap when unneeded
parents e59fa27d 883bd364

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

+4 −0
Original line number Diff line number Diff line
@@ -1370,4 +1370,8 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack 
            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 Diff line number Diff line
@@ -104,7 +104,12 @@ public final class GestureTrailsPreview extends AbstractDrawingPreview { 
        freeOffscreenBuffer();

    }



    public void deallocateMemory() {

        freeOffscreenBuffer();

    }



    private void freeOffscreenBuffer() {

        mOffscreenCanvas.setBitmap(null);

        if (mOffscreenBuffer != null) {

            mOffscreenBuffer.recycle();

            mOffscreenBuffer = null;

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

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

        if (mainKeyboardView != null) {

            mainKeyboardView.cancelAllOngoingEvents();

            mainKeyboardView.deallocateMemory();

        }

        // Remove pending messages related to update suggestions

        mHandler.cancelUpdateSuggestionStrip();