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

Commit 7d601af2 authored by Winson Chung's avatar Winson Chung
Browse files

3/ Ensure that drag shadow canvas matches activity hw acceleration 

- When an activity is hw accelerated it may be drawing content
  backed by a hw buffer, so the drag shadow canvas should match

Bug: 169894807
Test: atest DragDropTest
Change-Id: I35e07d9b3119df674c9e62a83765657ccbe074da
parent 1a9d7246

core/java/android/view/View.java

+6 −2
Original line number Diff line number Diff line
@@ -26443,7 +26443,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        surface.copyFrom(surfaceControl);

        IBinder token = null;

        try {

            final Canvas canvas = surface.lockCanvas(null);

            final Canvas canvas = isHardwareAccelerated()

                    ? surface.lockHardwareCanvas()

                    : surface.lockCanvas(null);

            try {

                canvas.drawColor(0, PorterDuff.Mode.CLEAR);

                shadowBuilder.onDrawShadow(canvas);
@@ -26534,7 +26536,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        }

        if (mAttachInfo.mDragToken != null) {

            try {

                Canvas canvas = mAttachInfo.mDragSurface.lockCanvas(null);

                Canvas canvas = isHardwareAccelerated()

                        ? mAttachInfo.mDragSurface.lockHardwareCanvas()

                        : mAttachInfo.mDragSurface.lockCanvas(null);

                try {

                    canvas.drawColor(0, PorterDuff.Mode.CLEAR);

                    shadowBuilder.onDrawShadow(canvas);