diff options
5 files changed, 131 insertions, 128 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationAnimationController.java b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationAnimationController.java index 0f4d63c7ebcc..7e96e48545ea 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationAnimationController.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationAnimationController.java @@ -149,7 +149,7 @@ class WindowMagnificationAnimationController implements ValueAnimator.AnimatorUp if (mState == STATE_ENABLING || mState == STATE_DISABLING) { mValueAnimator.cancel(); } - mController.enableWindowMagnificationInternal(scale, centerX, centerY, + mController.updateWindowMagnificationInternal(scale, centerX, centerY, mMagnificationFrameOffsetRatioX, mMagnificationFrameOffsetRatioY); updateState(); return; @@ -159,7 +159,7 @@ class WindowMagnificationAnimationController implements ValueAnimator.AnimatorUp if (mEndSpec.equals(mStartSpec)) { if (mState == STATE_DISABLED) { - mController.enableWindowMagnificationInternal(scale, centerX, centerY, + mController.updateWindowMagnificationInternal(scale, centerX, centerY, mMagnificationFrameOffsetRatioX, mMagnificationFrameOffsetRatioY); } else if (mState == STATE_ENABLING || mState == STATE_DISABLING) { mValueAnimator.cancel(); @@ -306,7 +306,7 @@ class WindowMagnificationAnimationController implements ValueAnimator.AnimatorUp // If the animation is playing backwards, mStartSpec will be the final spec we would // like to reach. AnimationSpec spec = isReverse ? mStartSpec : mEndSpec; - mController.enableWindowMagnificationInternal( + mController.updateWindowMagnificationInternal( spec.mScale, spec.mCenterX, spec.mCenterY, mMagnificationFrameOffsetRatioX, mMagnificationFrameOffsetRatioY); @@ -358,7 +358,7 @@ class WindowMagnificationAnimationController implements ValueAnimator.AnimatorUp mStartSpec.mCenterX + (mEndSpec.mCenterX - mStartSpec.mCenterX) * fract; final float centerY = mStartSpec.mCenterY + (mEndSpec.mCenterY - mStartSpec.mCenterY) * fract; - mController.enableWindowMagnificationInternal(sentScale, centerX, centerY, + mController.updateWindowMagnificationInternal(sentScale, centerX, centerY, mMagnificationFrameOffsetRatioX, mMagnificationFrameOffsetRatioY); } diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java index d65cd5c09dcf..a847c3d510b1 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java @@ -148,7 +148,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold /** * SourceBound is the bound of the magnified region which projects the magnified content. * SourceBound's center is equal to the parameters centerX and centerY in - * {@link WindowMagnificationController#enableWindowMagnificationInternal(float, float, float)}} + * {@link WindowMagnificationController#updateWindowMagnificationInternal(float, float, float)}} * but it is calculated from {@link #mMagnificationFrame}'s center in the runtime. */ private final Rect mSourceBounds = new Rect(); @@ -566,7 +566,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold // window size changed not caused by rotation. if (isActivated() && reCreateWindow) { deleteWindowMagnification(); - enableWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); + updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); } } @@ -1317,7 +1317,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold } /** - * Wraps {@link WindowMagnificationController#enableWindowMagnificationInternal(float, float, + * Wraps {@link WindowMagnificationController#updateWindowMagnificationInternal(float, float, * float, float, float)} * with transition animation. If the window magnification is not enabled, the scale will start * from 1.0 and the center won't be changed during the animation. If animator is @@ -1344,10 +1344,12 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold } /** - * Enables window magnification with specified parameters. If the given scale is <strong>less - * than or equal to 1.0f</strong>, then + * Updates window magnification status with specified parameters. If the given scale is + * <strong>less than 1.0f</strong>, then * {@link WindowMagnificationController#deleteWindowMagnification()} will be called instead to - * be consistent with the behavior of display magnification. + * be consistent with the behavior of display magnification. If the given scale is + * <strong>larger than or equal to 1.0f</strong>, and the window magnification is not activated + * yet, window magnification will be enabled. * * @param scale the target scale, or {@link Float#NaN} to leave unchanged * @param centerX the screen-relative X coordinate around which to center for magnification, @@ -1355,16 +1357,17 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold * @param centerY the screen-relative Y coordinate around which to center for magnification, * or {@link Float#NaN} to leave unchanged. */ - void enableWindowMagnificationInternal(float scale, float centerX, float centerY) { - enableWindowMagnificationInternal(scale, centerX, centerY, Float.NaN, Float.NaN); + void updateWindowMagnificationInternal(float scale, float centerX, float centerY) { + updateWindowMagnificationInternal(scale, centerX, centerY, Float.NaN, Float.NaN); } /** - * Enables window magnification with specified parameters. If the given scale is <strong>less - * than 1.0f</strong>, then + * Updates window magnification status with specified parameters. If the given scale is + * <strong>less than 1.0f</strong>, then * {@link WindowMagnificationController#deleteWindowMagnification()} will be called instead to - * be consistent with the behavior of display magnification. - * + * be consistent with the behavior of display magnification. If the given scale is + * <strong>larger than or equal to 1.0f</strong>, and the window magnification is not activated + * yet, window magnification will be enabled. * @param scale the target scale, or {@link Float#NaN} to leave unchanged * @param centerX the screen-relative X coordinate around which to center for magnification, * or {@link Float#NaN} to leave unchanged. @@ -1377,7 +1380,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold * between frame position Y and centerY, * or {@link Float#NaN} to leave unchanged. */ - void enableWindowMagnificationInternal(float scale, float centerX, float centerY, + void updateWindowMagnificationInternal(float scale, float centerX, float centerY, float magnificationFrameOffsetRatioX, float magnificationFrameOffsetRatioY) { if (Float.compare(scale, 1.0f) < 0) { deleteWindowMagnification(); @@ -1433,7 +1436,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold return; } - enableWindowMagnificationInternal(scale, Float.NaN, Float.NaN); + updateWindowMagnificationInternal(scale, Float.NaN, Float.NaN); mHandler.removeCallbacks(mUpdateStateDescriptionRunnable); mHandler.postDelayed(mUpdateStateDescriptionRunnable, UPDATE_STATE_DESCRIPTION_DELAY_MS); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationAnimationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationAnimationControllerTest.java index 69cd592d8f50..e0764205c85a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationAnimationControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationAnimationControllerTest.java @@ -181,7 +181,7 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase { throws RemoteException { enableWindowMagnificationAndWaitAnimating(mWaitAnimationDuration, mAnimationCallback); - verify(mSpyController, atLeast(2)).enableWindowMagnificationInternal( + verify(mSpyController, atLeast(2)).updateWindowMagnificationInternal( mScaleCaptor.capture(), mCenterXCaptor.capture(), mCenterYCaptor.capture(), mOffsetXCaptor.capture(), mOffsetYCaptor.capture()); @@ -220,7 +220,7 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase { mWaitAnimationDuration, /* targetScale= */ 1.0f, DEFAULT_CENTER_X, DEFAULT_CENTER_Y, mAnimationCallback); - verify(mSpyController).enableWindowMagnificationInternal(1.0f, DEFAULT_CENTER_X, + verify(mSpyController).updateWindowMagnificationInternal(1.0f, DEFAULT_CENTER_X, DEFAULT_CENTER_Y, 0f, 0f); verify(mAnimationCallback).onResult(true); } @@ -244,7 +244,7 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase { advanceTimeBy(mWaitAnimationDuration); }); - verify(mSpyController, atLeast(2)).enableWindowMagnificationInternal( + verify(mSpyController, atLeast(2)).updateWindowMagnificationInternal( mScaleCaptor.capture(), mCenterXCaptor.capture(), mCenterYCaptor.capture(), mOffsetXCaptor.capture(), mOffsetYCaptor.capture()); @@ -299,7 +299,7 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase { advanceTimeBy(mWaitAnimationDuration); }); - verify(mSpyController, atLeast(2)).enableWindowMagnificationInternal( + verify(mSpyController, atLeast(2)).updateWindowMagnificationInternal( mScaleCaptor.capture(), mCenterXCaptor.capture(), mCenterYCaptor.capture(), mOffsetXCaptor.capture(), mOffsetYCaptor.capture()); @@ -341,7 +341,7 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase { advanceTimeBy(mWaitAnimationDuration); }); - verify(mSpyController, atLeast(2)).enableWindowMagnificationInternal( + verify(mSpyController, atLeast(2)).updateWindowMagnificationInternal( mScaleCaptor.capture(), mCenterXCaptor.capture(), mCenterYCaptor.capture(), mOffsetXCaptor.capture(), mOffsetYCaptor.capture()); @@ -377,7 +377,7 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase { advanceTimeBy(mWaitAnimationDuration); }); - verify(mSpyController, atLeast(2)).enableWindowMagnificationInternal( + verify(mSpyController, atLeast(2)).updateWindowMagnificationInternal( mScaleCaptor.capture(), mCenterXCaptor.capture(), mCenterYCaptor.capture(), mOffsetXCaptor.capture(), mOffsetYCaptor.capture()); @@ -439,7 +439,7 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase { enableWindowMagnificationAndWaitAnimating( mWaitAnimationDuration, Float.NaN, Float.NaN, Float.NaN, mAnimationCallback2); - verify(mSpyController, never()).enableWindowMagnificationInternal(anyFloat(), anyFloat(), + verify(mSpyController, never()).updateWindowMagnificationInternal(anyFloat(), anyFloat(), anyFloat()); verify(mAnimationCallback).onResult(false); verify(mAnimationCallback2).onResult(true); @@ -479,7 +479,7 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase { // Verify the method is called in // {@link ValueAnimator.AnimatorUpdateListener#onAnimationUpdate} once and // {@link Animator.AnimatorListener#onAnimationEnd} once in {@link ValueAnimator#end()} - verify(mSpyController, times(2)).enableWindowMagnificationInternal( + verify(mSpyController, times(2)).updateWindowMagnificationInternal( mScaleCaptor.capture(), mCenterXCaptor.capture(), mCenterYCaptor.capture(), mOffsetXCaptor.capture(), mOffsetYCaptor.capture()); @@ -526,7 +526,7 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase { enableWindowMagnificationAndWaitAnimating(mWaitAnimationDuration, Float.NaN, Float.NaN, Float.NaN, mAnimationCallback2); - verify(mSpyController, never()).enableWindowMagnificationInternal(anyFloat(), anyFloat(), + verify(mSpyController, never()).updateWindowMagnificationInternal(anyFloat(), anyFloat(), anyFloat()); verify(mSpyController, never()).deleteWindowMagnification(); verify(mAnimationCallback).onResult(false); @@ -551,7 +551,7 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase { advanceTimeBy(mWaitAnimationDuration); }); - verify(mSpyController, atLeast(2)).enableWindowMagnificationInternal( + verify(mSpyController, atLeast(2)).updateWindowMagnificationInternal( mScaleCaptor.capture(), mCenterXCaptor.capture(), mCenterYCaptor.capture(), mOffsetXCaptor.capture(), mOffsetYCaptor.capture()); @@ -720,7 +720,7 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase { enableWindowMagnificationAndWaitAnimating(mWaitAnimationDuration, mAnimationCallback); - verify(mSpyController, never()).enableWindowMagnificationInternal(anyFloat(), anyFloat(), + verify(mSpyController, never()).updateWindowMagnificationInternal(anyFloat(), anyFloat(), anyFloat()); verify(mAnimationCallback).onResult(true); } @@ -733,7 +733,7 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase { resetMockObjects(); deleteWindowMagnificationAndWaitAnimating(mWaitAnimationDuration, mAnimationCallback); - verify(mSpyController, atLeast(2)).enableWindowMagnificationInternal( + verify(mSpyController, atLeast(2)).updateWindowMagnificationInternal( mScaleCaptor.capture(), mCenterXCaptor.capture(), mCenterYCaptor.capture(), mOffsetXCaptor.capture(), mOffsetYCaptor.capture()); @@ -790,7 +790,7 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase { // Verify the method is called in // {@link ValueAnimator.AnimatorUpdateListener#onAnimationUpdate} once and // {@link Animator.AnimatorListener#onAnimationEnd} once in {@link ValueAnimator#end()} - verify(mSpyController, times(2)).enableWindowMagnificationInternal( + verify(mSpyController, times(2)).updateWindowMagnificationInternal( mScaleCaptor.capture(), mCenterXCaptor.capture(), mCenterYCaptor.capture(), mOffsetXCaptor.capture(), mOffsetYCaptor.capture()); @@ -835,7 +835,7 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase { // {@link ValueAnimator.AnimatorUpdateListener#onAnimationUpdate} once and // {@link Animator.AnimatorListener#onAnimationEnd} once when running the animation at // the final duration time. - verify(mSpyController, times(2)).enableWindowMagnificationInternal( + verify(mSpyController, times(2)).updateWindowMagnificationInternal( mScaleCaptor.capture(), mCenterXCaptor.capture(), mCenterYCaptor.capture(), mOffsetXCaptor.capture(), mOffsetYCaptor.capture()); @@ -1040,17 +1040,17 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase { } @Override - void enableWindowMagnificationInternal(float scale, float centerX, float centerY) { - super.enableWindowMagnificationInternal(scale, centerX, centerY); - mSpyController.enableWindowMagnificationInternal(scale, centerX, centerY); + void updateWindowMagnificationInternal(float scale, float centerX, float centerY) { + super.updateWindowMagnificationInternal(scale, centerX, centerY); + mSpyController.updateWindowMagnificationInternal(scale, centerX, centerY); } @Override - void enableWindowMagnificationInternal(float scale, float centerX, float centerY, + void updateWindowMagnificationInternal(float scale, float centerX, float centerY, float magnificationOffsetFrameRatioX, float magnificationOffsetFrameRatioY) { - super.enableWindowMagnificationInternal(scale, centerX, centerY, + super.updateWindowMagnificationInternal(scale, centerX, centerY, magnificationOffsetFrameRatioX, magnificationOffsetFrameRatioY); - mSpyController.enableWindowMagnificationInternal(scale, centerX, centerY, + mSpyController.updateWindowMagnificationInternal(scale, centerX, centerY, magnificationOffsetFrameRatioX, magnificationOffsetFrameRatioY); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java index 6f285fb01cf5..cb42078460c2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java @@ -273,7 +273,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { @Test public void enableWindowMagnification_showControlAndNotifyBoundsChanged() { mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); }); @@ -341,7 +341,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { @Test public void enableWindowMagnification_systemGestureExclusionRectsIsSet() { mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); }); // Wait for Rects updated. @@ -358,7 +358,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { mWindowManager.setWindowBounds(new Rect(0, 0, screenSize, screenSize)); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); }); @@ -373,7 +373,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { @Test public void deleteWindowMagnification_destroyControlAndUnregisterComponentCallback() { mInstrumentation.runOnMainSync( - () -> mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, + () -> mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN)); @@ -391,7 +391,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { setSystemGestureInsets(); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, bounds.bottom); }); ReferenceTestUtils.waitForCondition(this::hasMagnificationOverlapFlag); @@ -407,7 +407,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { @Test public void deleteWindowMagnification_notifySourceBoundsChanged() { mInstrumentation.runOnMainSync( - () -> mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, + () -> mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN)); @@ -423,7 +423,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { @Test public void moveMagnifier_schedulesFrame() { mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); mWindowMagnificationController.moveWindowMagnifier(100f, 100f); }); @@ -506,7 +506,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { @Test public void setScale_enabled_expectedValueAndUpdateStateDescription() { mInstrumentation.runOnMainSync( - () -> mWindowMagnificationController.enableWindowMagnificationInternal(2.0f, + () -> mWindowMagnificationController.updateWindowMagnificationInternal(2.0f, Float.NaN, Float.NaN)); mInstrumentation.runOnMainSync(() -> mWindowMagnificationController.setScale(3.0f)); @@ -539,7 +539,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { final float displayWidth = windowBounds.width(); final PointF magnifiedCenter = new PointF(center, center + 5f); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, magnifiedCenter.x, magnifiedCenter.y); // Get the center again in case the center we set is out of screen. magnifiedCenter.set(mWindowMagnificationController.getCenterX(), @@ -582,7 +582,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { final float expectedRatio = 0.5f; mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); }); @@ -621,8 +621,8 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { preferredWindowSize.toString()) .commit(); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController - .enableWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, + Float.NaN); }); // Change screen density and size to trigger restoring the preferred window size @@ -649,7 +649,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { @Test public void screenSizeIsChangedToLarge_enabled_defaultWindowSize() { mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); }); final int screenSize = mWindowManager.getCurrentWindowMetrics().getBounds().width() * 10; @@ -674,7 +674,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { @Test public void onDensityChanged_enabled_updateDimensionsAndResetWindowMagnification() { mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); Mockito.reset(mWindowManager); Mockito.reset(mMirrorWindowControl); @@ -703,7 +703,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { @Test public void initializeA11yNode_enabled_expectedValues() { mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(2.5f, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(2.5f, Float.NaN, Float.NaN); }); final View mirrorView = mWindowManager.getAttachedView(); @@ -727,7 +727,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { public void performA11yActions_visible_expectedResults() { final int displayId = mContext.getDisplayId(); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(1.5f, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(1.5f, Float.NaN, Float.NaN); }); @@ -761,7 +761,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { public void performA11yActions_visible_notifyAccessibilityActionPerformed() { final int displayId = mContext.getDisplayId(); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(2.5f, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(2.5f, Float.NaN, Float.NaN); }); @@ -774,7 +774,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { @Test public void windowMagnifierEditMode_performA11yClickAction_exitEditMode() { mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); mWindowMagnificationController.setEditMagnifierSizeMode(true); }); @@ -812,7 +812,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { /* pbase= */ 1); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); mWindowMagnificationController.setWindowSize(startingWidth, startingHeight); mWindowMagnificationController.setEditMagnifierSizeMode(true); @@ -852,7 +852,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { /* pbase= */ 1); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); mWindowMagnificationController.setWindowSize(startingWidth, startingHeight); mWindowMagnificationController.setEditMagnifierSizeMode(true); @@ -888,7 +888,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { final int startingHeight = windowBounds.height(); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); mWindowMagnificationController.setWindowSize(startingWidth, startingHeight); mWindowMagnificationController.setEditMagnifierSizeMode(true); @@ -908,7 +908,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { final int startingHeight = windowBounds.height(); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); mWindowMagnificationController.setWindowSize(startingWidth, startingHeight); mWindowMagnificationController.setEditMagnifierSizeMode(true); @@ -931,7 +931,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { /* base= */ 1, /* pbase= */ 1); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); mWindowMagnificationController.setWindowSize(startingSize, startingSize); mWindowMagnificationController.setEditMagnifierSizeMode(true); @@ -971,7 +971,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { /* pbase= */ 1); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); mWindowMagnificationController.setWindowSize(startingSize, startingSize); mWindowMagnificationController.setEditMagnifierSizeMode(true); @@ -1007,7 +1007,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { final int startingSize = mMinWindowSize; mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); mWindowMagnificationController.setWindowSize(startingSize, startingSize); mWindowMagnificationController.setEditMagnifierSizeMode(true); @@ -1027,7 +1027,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { final int startingSize = mMinWindowSize; mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); mWindowMagnificationController.setWindowSize(startingSize, startingSize); mWindowMagnificationController.setEditMagnifierSizeMode(true); @@ -1043,7 +1043,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { @Test public void enableWindowMagnification_hasA11yWindowTitle() { mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); }); @@ -1054,12 +1054,12 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { @Test public void enableWindowMagnificationWithScaleLessThanOne_enabled_disabled() { mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); }); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(0.9f, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(0.9f, Float.NaN, Float.NaN); }); @@ -1078,7 +1078,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { final int newRotation = simulateRotateTheDevice(); mInstrumentation.runOnMainSync( - () -> mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, + () -> mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN)); assertEquals(newRotation, mWindowMagnificationController.mRotation); @@ -1087,7 +1087,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { @Test public void enableWindowMagnification_registerComponentCallback() { mInstrumentation.runOnMainSync( - () -> mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, + () -> mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN)); @@ -1098,7 +1098,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { public void onLocaleChanged_enabled_updateA11yWindowTitle() { final String newA11yWindowTitle = "new a11y window title"; mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); }); final TestableResources testableResources = getContext().getOrCreateTestableResources(); @@ -1116,7 +1116,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { @Test public void onSingleTap_enabled_scaleAnimates() { mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); }); @@ -1143,7 +1143,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { final Rect bounds = mWindowManager.getCurrentWindowMetrics().getBounds(); setSystemGestureInsets(); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); }); @@ -1161,7 +1161,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { setSystemGestureInsets(); mInstrumentation.runOnMainSync( () -> { - mWindowMagnificationController.enableWindowMagnificationInternal( + mWindowMagnificationController.updateWindowMagnificationInternal( Float.NaN, Float.NaN, Float.NaN); }); @@ -1197,7 +1197,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { setSystemGestureInsets(); mInstrumentation.runOnMainSync( () -> { - mWindowMagnificationController.enableWindowMagnificationInternal( + mWindowMagnificationController.updateWindowMagnificationInternal( Float.NaN, Float.NaN, Float.NaN); }); @@ -1232,7 +1232,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { final int expectedWindowHeight = minimumWindowSize; final int expectedWindowWidth = minimumWindowSize; mInstrumentation.runOnMainSync( - () -> mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, + () -> mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN)); final AtomicInteger actualWindowHeight = new AtomicInteger(); @@ -1259,7 +1259,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { final AtomicInteger actualWindowWidth = new AtomicInteger(); mInstrumentation.runOnMainSync(() -> { mWindowMagnificationController.setWindowSize(expectedWindowWidth, expectedWindowHeight); - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); actualWindowHeight.set(mWindowManager.getLayoutParamsFromAttachedView().height); actualWindowWidth.set(mWindowManager.getLayoutParamsFromAttachedView().width); @@ -1274,7 +1274,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { final int minimumWindowSize = mResources.getDimensionPixelSize( com.android.internal.R.dimen.accessibility_window_magnifier_min_size); mInstrumentation.runOnMainSync( - () -> mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, + () -> mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN)); final AtomicInteger actualWindowHeight = new AtomicInteger(); @@ -1294,7 +1294,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { public void setWindowSizeLargerThanScreenSize_enabled_windowSizeIsScreenSize() { final Rect bounds = mWindowManager.getCurrentWindowMetrics().getBounds(); mInstrumentation.runOnMainSync( - () -> mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, + () -> mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN)); final AtomicInteger actualWindowHeight = new AtomicInteger(); @@ -1323,7 +1323,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { mInstrumentation.runOnMainSync( () -> - mWindowMagnificationController.enableWindowMagnificationInternal( + mWindowMagnificationController.updateWindowMagnificationInternal( Float.NaN, Float.NaN, Float.NaN)); final AtomicInteger actualWindowHeight = new AtomicInteger(); @@ -1348,7 +1348,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { mInstrumentation.runOnMainSync( () -> - mWindowMagnificationController.enableWindowMagnificationInternal( + mWindowMagnificationController.updateWindowMagnificationInternal( Float.NaN, Float.NaN, Float.NaN)); final AtomicInteger actualWindowHeight = new AtomicInteger(); @@ -1382,7 +1382,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { mInstrumentation.runOnMainSync( () -> - mWindowMagnificationController.enableWindowMagnificationInternal( + mWindowMagnificationController.updateWindowMagnificationInternal( Float.NaN, Float.NaN, Float.NaN)); final AtomicInteger actualWindowHeight = new AtomicInteger(); @@ -1408,7 +1408,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { com.android.internal.R.dimen.accessibility_window_magnifier_min_size); final Rect bounds = mWindowManager.getCurrentWindowMetrics().getBounds(); mInstrumentation.runOnMainSync( - () -> mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, + () -> mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN)); final AtomicInteger magnificationCenterX = new AtomicInteger(); @@ -1429,7 +1429,7 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { final Rect bounds = mWindowManager.getCurrentWindowMetrics().getBounds(); mInstrumentation.runOnMainSync( () -> { - mWindowMagnificationController.enableWindowMagnificationInternal( + mWindowMagnificationController.updateWindowMagnificationInternal( 1.5f, bounds.centerX(), bounds.centerY()); }); View dragButton = getInternalView(R.id.drag_handle); diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerWindowlessMagnifierTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerWindowlessMagnifierTest.java index e9d36b861776..a88654bdbecc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerWindowlessMagnifierTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerWindowlessMagnifierTest.java @@ -282,7 +282,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT @Test public void enableWindowMagnification_showControlAndNotifyBoundsChanged() { mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); }); @@ -351,7 +351,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT @Test public void enableWindowMagnification_systemGestureExclusionRectsIsSet() { mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); }); // Wait for Rects updated. @@ -368,7 +368,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT mWindowManager.setWindowBounds(new Rect(0, 0, screenSize, screenSize)); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); }); @@ -383,7 +383,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT @Test public void deleteWindowMagnification_destroyControlAndUnregisterComponentCallback() { mInstrumentation.runOnMainSync( - () -> mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, + () -> mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN)); @@ -401,7 +401,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT setSystemGestureInsets(); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, bounds.bottom); }); ReferenceTestUtils.waitForCondition(this::hasMagnificationOverlapFlag); @@ -417,7 +417,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT @Test public void deleteWindowMagnification_notifySourceBoundsChanged() { mInstrumentation.runOnMainSync( - () -> mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, + () -> mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN)); @@ -433,7 +433,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT @Test public void moveMagnifier_schedulesFrame() { mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); }); @@ -520,7 +520,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT @Test public void setScale_enabled_expectedValueAndUpdateStateDescription() { mInstrumentation.runOnMainSync( - () -> mWindowMagnificationController.enableWindowMagnificationInternal(2.0f, + () -> mWindowMagnificationController.updateWindowMagnificationInternal(2.0f, Float.NaN, Float.NaN)); mInstrumentation.runOnMainSync(() -> mWindowMagnificationController.setScale(3.0f)); @@ -553,7 +553,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT final float displayWidth = windowBounds.width(); final PointF magnifiedCenter = new PointF(center, center + 5f); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, magnifiedCenter.x, magnifiedCenter.y); // Get the center again in case the center we set is out of screen. magnifiedCenter.set(mWindowMagnificationController.getCenterX(), @@ -596,7 +596,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT final float expectedRatio = 0.5f; mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); }); @@ -635,8 +635,8 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT preferredWindowSize.toString()) .commit(); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController - .enableWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, + Float.NaN); }); // Screen density and size change @@ -663,7 +663,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT @Test public void screenSizeIsChangedToLarge_enabled_defaultWindowSize() { mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); }); final int screenSize = mWindowManager.getCurrentWindowMetrics().getBounds().width() * 10; @@ -688,7 +688,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT @Test public void onDensityChanged_enabled_updateDimensionsAndResetWindowMagnification() { mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); Mockito.reset(mWindowManager); Mockito.reset(mMirrorWindowControl); @@ -717,7 +717,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT @Test public void initializeA11yNode_enabled_expectedValues() { mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(2.5f, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(2.5f, Float.NaN, Float.NaN); }); final View mirrorView = mSurfaceControlViewHost.getView(); @@ -741,7 +741,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT public void performA11yActions_visible_expectedResults() { final int displayId = mContext.getDisplayId(); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(1.5f, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(1.5f, Float.NaN, Float.NaN); }); @@ -775,7 +775,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT public void performA11yActions_visible_notifyAccessibilityActionPerformed() { final int displayId = mContext.getDisplayId(); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(2.5f, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(2.5f, Float.NaN, Float.NaN); }); @@ -788,7 +788,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT @Test public void windowMagnifierEditMode_performA11yClickAction_exitEditMode() { mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); mWindowMagnificationController.setEditMagnifierSizeMode(true); }); @@ -829,7 +829,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT /* pbase= */ 1); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); mWindowMagnificationController.setWindowSize(startingWidth, startingHeight); mWindowMagnificationController.setEditMagnifierSizeMode(true); @@ -871,7 +871,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT /* pbase= */ 1); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); mWindowMagnificationController.setWindowSize(startingWidth, startingHeight); mWindowMagnificationController.setEditMagnifierSizeMode(true); @@ -909,7 +909,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT final int startingHeight = windowBounds.height(); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); mWindowMagnificationController.setWindowSize(startingWidth, startingHeight); mWindowMagnificationController.setEditMagnifierSizeMode(true); @@ -929,7 +929,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT final int startingHeight = windowBounds.height(); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); mWindowMagnificationController.setWindowSize(startingWidth, startingHeight); mWindowMagnificationController.setEditMagnifierSizeMode(true); @@ -952,7 +952,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT /* base= */ 1, /* pbase= */ 1); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); mWindowMagnificationController.setWindowSize(startingSize, startingSize); mWindowMagnificationController.setEditMagnifierSizeMode(true); @@ -994,7 +994,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT /* pbase= */ 1); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); mWindowMagnificationController.setWindowSize(startingSize, startingSize); mWindowMagnificationController.setEditMagnifierSizeMode(true); @@ -1032,7 +1032,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT final int startingSize = mMinWindowSize; mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); mWindowMagnificationController.setWindowSize(startingSize, startingSize); mWindowMagnificationController.setEditMagnifierSizeMode(true); @@ -1052,7 +1052,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT final int startingSize = mMinWindowSize; mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); mWindowMagnificationController.setWindowSize(startingSize, startingSize); mWindowMagnificationController.setEditMagnifierSizeMode(true); @@ -1068,7 +1068,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT @Test public void enableWindowMagnification_hasA11yWindowTitle() { mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); }); @@ -1079,12 +1079,12 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT @Test public void enableWindowMagnificationWithScaleLessThanOne_enabled_disabled() { mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); }); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(0.9f, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(0.9f, Float.NaN, Float.NaN); }); @@ -1103,7 +1103,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT final int newRotation = simulateRotateTheDevice(); mInstrumentation.runOnMainSync( - () -> mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, + () -> mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN)); assertEquals(newRotation, mWindowMagnificationController.mRotation); @@ -1112,7 +1112,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT @Test public void enableWindowMagnification_registerComponentCallback() { mInstrumentation.runOnMainSync( - () -> mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, + () -> mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN)); @@ -1123,7 +1123,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT public void onLocaleChanged_enabled_updateA11yWindowTitle() { final String newA11yWindowTitle = "new a11y window title"; mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); }); final TestableResources testableResources = getContext().getOrCreateTestableResources(); @@ -1141,7 +1141,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT @Test public void onSingleTap_enabled_scaleAnimates() { mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); }); @@ -1168,7 +1168,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT final Rect bounds = mWindowManager.getCurrentWindowMetrics().getBounds(); setSystemGestureInsets(); mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); }); @@ -1186,7 +1186,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT setSystemGestureInsets(); mInstrumentation.runOnMainSync( () -> { - mWindowMagnificationController.enableWindowMagnificationInternal( + mWindowMagnificationController.updateWindowMagnificationInternal( Float.NaN, Float.NaN, Float.NaN); }); // Wait for Region updated. @@ -1215,7 +1215,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT setSystemGestureInsets(); mInstrumentation.runOnMainSync( () -> { - mWindowMagnificationController.enableWindowMagnificationInternal( + mWindowMagnificationController.updateWindowMagnificationInternal( Float.NaN, Float.NaN, Float.NaN); }); // Wait for Region updated. @@ -1244,7 +1244,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT final int expectedWindowHeight = minimumWindowSize; final int expectedWindowWidth = minimumWindowSize; mInstrumentation.runOnMainSync( - () -> mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, + () -> mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN)); final AtomicInteger actualWindowHeight = new AtomicInteger(); @@ -1271,7 +1271,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT final AtomicInteger actualWindowWidth = new AtomicInteger(); mInstrumentation.runOnMainSync(() -> { mWindowMagnificationController.setWindowSize(expectedWindowWidth, expectedWindowHeight); - mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, + mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN); actualWindowHeight.set(mSurfaceControlViewHost.getView().getLayoutParams().height); actualWindowWidth.set(mSurfaceControlViewHost.getView().getLayoutParams().width); @@ -1286,7 +1286,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT final int minimumWindowSize = mResources.getDimensionPixelSize( com.android.internal.R.dimen.accessibility_window_magnifier_min_size); mInstrumentation.runOnMainSync( - () -> mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, + () -> mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN)); final AtomicInteger actualWindowHeight = new AtomicInteger(); @@ -1306,7 +1306,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT public void setWindowSizeLargerThanScreenSize_enabled_windowSizeIsScreenSize() { final Rect bounds = mWindowManager.getCurrentWindowMetrics().getBounds(); mInstrumentation.runOnMainSync( - () -> mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, + () -> mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN)); final AtomicInteger actualWindowHeight = new AtomicInteger(); @@ -1335,7 +1335,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT mInstrumentation.runOnMainSync( () -> - mWindowMagnificationController.enableWindowMagnificationInternal( + mWindowMagnificationController.updateWindowMagnificationInternal( Float.NaN, Float.NaN, Float.NaN)); final AtomicInteger actualWindowHeight = new AtomicInteger(); @@ -1362,7 +1362,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT mInstrumentation.runOnMainSync( () -> - mWindowMagnificationController.enableWindowMagnificationInternal( + mWindowMagnificationController.updateWindowMagnificationInternal( Float.NaN, Float.NaN, Float.NaN)); final AtomicInteger actualWindowHeight = new AtomicInteger(); @@ -1398,7 +1398,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT mInstrumentation.runOnMainSync( () -> - mWindowMagnificationController.enableWindowMagnificationInternal( + mWindowMagnificationController.updateWindowMagnificationInternal( Float.NaN, Float.NaN, Float.NaN)); final AtomicInteger actualWindowHeight = new AtomicInteger(); @@ -1426,7 +1426,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT com.android.internal.R.dimen.accessibility_window_magnifier_min_size); final Rect bounds = mWindowManager.getCurrentWindowMetrics().getBounds(); mInstrumentation.runOnMainSync( - () -> mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, + () -> mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, Float.NaN)); final AtomicInteger magnificationCenterX = new AtomicInteger(); @@ -1447,7 +1447,7 @@ public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiT final Rect bounds = mWindowManager.getCurrentWindowMetrics().getBounds(); mInstrumentation.runOnMainSync( () -> { - mWindowMagnificationController.enableWindowMagnificationInternal( + mWindowMagnificationController.updateWindowMagnificationInternal( 1.5f, bounds.centerX(), bounds.centerY()); }); View dragButton = getInternalView(R.id.drag_handle); |