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

Commit b6bfa268 authored by Ryan Lin's avatar Ryan Lin Committed by Automerger Merge Worker
Browse files

Merge "Fix incorrect magnification border after rotation" into sc-dev am: 9da336b4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909658

Change-Id: Ifeb346220dbd930d840e21f1da6af976696c4c2b
parents cb32c76b 9da336b4

services/core/java/com/android/server/wm/AccessibilityController.java

+17 −16
Original line number Diff line number Diff line
@@ -735,7 +735,7 @@ final class AccessibilityController { 
                Slog.i(LOG_TAG, "Rotation: " + Surface.rotationToString(rotation)

                        + " displayId: " + displayContent.getDisplayId());

            }

            mMagnifedViewport.onRotationChanged(displayContent.getPendingTransaction());

            mMagnifedViewport.onRotationChanged();

            mHandler.sendEmptyMessage(MyHandler.MESSAGE_NOTIFY_ROTATION_CHANGED);

        }
@@ -894,7 +894,7 @@ final class AccessibilityController { 


            private final RectF mTempRectF = new RectF();



            private final Point mTempPoint = new Point();

            private final Point mScreenSize = new Point();



            private final Matrix mTempMatrix = new Matrix();
@@ -923,8 +923,8 @@ final class AccessibilityController { 


                if (mDisplayContext.getResources().getConfiguration().isScreenRound()) {

                    mCircularPath = new Path();

                    mDisplay.getRealSize(mTempPoint);

                    final int centerXY = mTempPoint.x / 2;

                    mDisplay.getRealSize(mScreenSize);

                    final int centerXY = mScreenSize.x / 2;

                    mCircularPath.addCircle(centerXY, centerXY, centerXY, Path.Direction.CW);

                } else {

                    mCircularPath = null;
@@ -953,9 +953,9 @@ final class AccessibilityController { 
            }



            void recomputeBounds() {

                mDisplay.getRealSize(mTempPoint);

                final int screenWidth = mTempPoint.x;

                final int screenHeight = mTempPoint.y;

                mDisplay.getRealSize(mScreenSize);

                final int screenWidth = mScreenSize.x;

                final int screenHeight = mScreenSize.y;



                mMagnificationRegion.set(0, 0, 0, 0);

                final Region availableBounds = mTempRegion1;
@@ -1088,7 +1088,7 @@ final class AccessibilityController { 
                        || windowType == TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY;

            }



            void onRotationChanged(SurfaceControl.Transaction t) {

            void onRotationChanged() {

                // If we are showing the magnification border, hide it immediately so

                // the user does not see strange artifacts during rotation. The screenshot

                // used for rotation already has the border. After the rotation is complete
@@ -1102,7 +1102,7 @@ final class AccessibilityController { 
                    mHandler.sendMessageDelayed(message, delay);

                }

                recomputeBounds();

                mWindow.updateSize(t);

                mWindow.updateSize();

            }



            void setMagnifiedRegionBorderShown(boolean shown, boolean animate) {
@@ -1184,9 +1184,9 @@ final class AccessibilityController { 
                        /* ignore */

                    }

                    mSurfaceControl = surfaceControl;

                    mDisplay.getRealSize(mTempPoint);

                    mDisplay.getRealSize(mScreenSize);

                    mBlastBufferQueue = new BLASTBufferQueue(SURFACE_TITLE, mSurfaceControl,

                            mTempPoint.x, mTempPoint.y, PixelFormat.RGBA_8888);

                            mScreenSize.x, mScreenSize.y, PixelFormat.RGBA_8888);



                    final SurfaceControl.Transaction t = mService.mTransactionFactory.get();

                    final int layer =
@@ -1260,10 +1260,11 @@ final class AccessibilityController { 
                    }

                }



                void updateSize(SurfaceControl.Transaction t) {

                void updateSize() {

                    synchronized (mService.mGlobalLock) {

                        mDisplay.getRealSize(mTempPoint);

                        t.setBufferSize(mSurfaceControl, mTempPoint.x, mTempPoint.y);

                        mDisplay.getRealSize(mScreenSize);

                        mBlastBufferQueue.update(mSurfaceControl, mScreenSize.x, mScreenSize.y,

                                PixelFormat.RGBA_8888);

                        invalidate(mDirtyRect);

                    }

                }
@@ -1332,8 +1333,8 @@ final class AccessibilityController { 
                    pw.println(prefix

                            + " mBounds= " + mBounds

                            + " mDirtyRect= " + mDirtyRect

                            + " mWidth= " + mSurfaceControl.getWidth()

                            + " mHeight= " + mSurfaceControl.getHeight());

                            + " mWidth= " + mScreenSize.x

                            + " mHeight= " + mScreenSize.y);

                }



                private final class AnimationController extends Handler {