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

Commit 7505e331 authored by Svetoslav's avatar Svetoslav
Browse files

Fix jank in when drawing magnification bounds 

There was an off-by-one error in computing the invalidated
rectangle when drawing the magnified region border.

bug:17199352

Change-Id: Id0a1af092b7124bbdca316534c035ed9af829326
parent 105f6ceb

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

+11 −8
Original line number Diff line number Diff line
@@ -412,8 +412,9 @@ final class AccessibilityController { 


            private final WindowManager mWindowManager;



            private final int mBorderWidth;

            private final float mBorderWidth;

            private final int mHalfBorderWidth;

            private final int mDrawBorderInset;



            private final ViewportWindow mWindow;
@@ -421,10 +422,11 @@ final class AccessibilityController { 


            public MagnifiedViewport() {

                mWindowManager = (WindowManager) mContext.getSystemService(Service.WINDOW_SERVICE);

                mBorderWidth = (int) TypedValue.applyDimension(

                mBorderWidth = TypedValue.applyDimension(

                        TypedValue.COMPLEX_UNIT_DIP, DEFAUTLT_BORDER_WIDTH_DIP,

                                mContext.getResources().getDisplayMetrics());

                mHalfBorderWidth = (int) (mBorderWidth + 0.5) / 2;

                mHalfBorderWidth = (int) Math.ceil(mBorderWidth / 2);

                mDrawBorderInset = (int) mBorderWidth / 2;

                mWindow = new ViewportWindow(mContext);

                recomputeBoundsLocked();

            }
@@ -437,7 +439,8 @@ final class AccessibilityController { 
                }

                // If this message is pending we are in a rotation animation and do not want

                // to show the border. We will do so when the pending message is handled.

                if (!mHandler.hasMessages(MyHandler.MESSAGE_SHOW_MAGNIFIED_REGION_BOUNDS_IF_NEEDED)) {

                if (!mHandler.hasMessages(

                        MyHandler.MESSAGE_SHOW_MAGNIFIED_REGION_BOUNDS_IF_NEEDED)) {

                    setMagnifiedRegionBorderShownLocked(isMagnifyingLocked(), true);

                }

            }
@@ -513,8 +516,8 @@ final class AccessibilityController { 


                visibleWindows.clear();



                magnifiedBounds.op(mHalfBorderWidth, mHalfBorderWidth,

                        screenWidth - mHalfBorderWidth, screenHeight - mHalfBorderWidth,

                magnifiedBounds.op(mDrawBorderInset, mDrawBorderInset,

                        screenWidth - mDrawBorderInset, screenHeight - mDrawBorderInset,

                        Region.Op.INTERSECT);



                if (!mOldMagnifiedBounds.equals(magnifiedBounds)) {
@@ -527,8 +530,8 @@ final class AccessibilityController { 
                    Rect dirtyRect = mTempRect1;

                    if (mFullRedrawNeeded) {

                        mFullRedrawNeeded = false;

                        dirtyRect.set(mHalfBorderWidth, mHalfBorderWidth,

                                screenWidth - mHalfBorderWidth, screenHeight - mHalfBorderWidth);

                        dirtyRect.set(mDrawBorderInset, mDrawBorderInset,

                                screenWidth - mDrawBorderInset, screenHeight - mDrawBorderInset);

                        mWindow.invalidate(dirtyRect);

                    } else {

                        Region dirtyRegion = mTempRegion3;