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

Commit 22b53e9f authored by Tarandeep Singh's avatar Tarandeep Singh Committed by android-build-merger
Browse files

Merge "Stop using unsupported Canvas operations in IME" into pi-dev

am: 0355dd64

Change-Id: I678d7c263459664a28b4fa72ee2ef60c91fd118f
parents cb69a53c 0355dd64
Loading
Loading
Loading
Loading
+6 −7
Original line number Diff line number Diff line
@@ -21,18 +21,15 @@ import android.content.res.TypedArray;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Paint.Align;
import android.graphics.PorterDuff;
import android.graphics.Rect;
import android.graphics.Typeface;
import android.graphics.Paint.Align;
import android.graphics.Region.Op;
import android.graphics.drawable.Drawable;
import android.inputmethodservice.Keyboard.Key;
import android.media.AudioManager;
import android.os.Handler;
import android.os.Message;
import android.os.UserHandle;
import android.provider.Settings;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.GestureDetector;
@@ -662,11 +659,13 @@ public class KeyboardView extends View implements View.OnClickListener {
            invalidateAllKeys();
            mKeyboardChanged = false;
        }
        final Canvas canvas = mCanvas;
        canvas.clipRect(mDirtyRect, Op.REPLACE);

        if (mKeyboard == null) return;

        mCanvas.save();
        final Canvas canvas = mCanvas;
        canvas.clipRect(mDirtyRect);

        final Paint paint = mPaint;
        final Drawable keyBackground = mKeyBackground;
        final Rect clipRegion = mClipRegion;
@@ -758,7 +757,7 @@ public class KeyboardView extends View implements View.OnClickListener {
            paint.setColor(0xFF00FF00);
            canvas.drawCircle((mStartX + mLastX) / 2, (mStartY + mLastY) / 2, 2, paint);
        }

        mCanvas.restore();
        mDrawPending = false;
        mDirtyRect.setEmpty();
    }