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

Commit c049c80e authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Fix issue with black flash when swiping up" into ub-launcher3-master

parents be3430a7 469864e4

quickstep/src/com/android/quickstep/views/TaskThumbnailView.java

+7 −8
Original line number Diff line number Diff line
@@ -116,8 +116,12 @@ public class TaskThumbnailView extends View { 
        mIsDarkTextTheme = Themes.getAttrBoolean(mActivity, R.attr.isWorkspaceDarkText);

    }



    public void bind() {

    public void bind(Task task) {

        mOverlay.reset();

        mTask = task;

        int color = task == null ? Color.BLACK : task.colorBackground | 0xFF000000;

        mPaint.setColor(color);

        mBackgroundPaint.setColor(color);

    }



    /**
@@ -125,10 +129,6 @@ public class TaskThumbnailView extends View { 
     */

    public void setThumbnail(Task task, ThumbnailData thumbnailData) {

        mTask = task;

        int color = task == null ? Color.BLACK : task.colorBackground | 0xFF000000;

        mPaint.setColor(color);

        mBackgroundPaint.setColor(color);



        if (thumbnailData != null && thumbnailData.thumbnail != null) {

            Bitmap bm = thumbnailData.thumbnail;

            bm.prepareToDraw();
@@ -255,15 +255,14 @@ public class TaskThumbnailView extends View { 


    private void updateThumbnailPaintFilter() {

        int mul = (int) ((1 - mDimAlpha * mDimAlphaMultiplier) * 255);

        ColorFilter filter = getColorFilter(mul, mIsDarkTextTheme, mSaturation);

        mBackgroundPaint.setColorFilter(filter);

        mDimmingPaintAfterClearing.setAlpha(255 - mul);

        if (mBitmapShader != null) {

            ColorFilter filter = getColorFilter(mul, mIsDarkTextTheme, mSaturation);

            mPaint.setColorFilter(filter);

            mBackgroundPaint.setColorFilter(filter);

        } else {

            mPaint.setColorFilter(null);

            mPaint.setColor(Color.argb(255, mul, mul, mul));

            mBackgroundPaint.setColorFilter(null);

        }

        invalidate();

    }

quickstep/src/com/android/quickstep/views/TaskView.java

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ public class TaskView extends FrameLayout implements PageCallbacks { 
     */

    public void bind(Task task) {

        mTask = task;

        mSnapshotView.bind();

        mSnapshotView.bind(task);

    }



    public Task getTask() {