Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Assigns the default value of the cache magnification mode" into sc-dev am: d772c72acb

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

Change-Id: Ia7af75f25cd265e3fbb2ee222f58eb7bfe964d15
This commit is contained in:
Minche Li
2021-05-25 00:41:54 +00:00
committed by Automerger Merge Worker
parent 1c0a2f03e7 d772c72acb
commit fc42ac85d8
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/accessibility/MagnificationModeSwitch.java
View File

@@ -16,6 +16,7 @@
package com.android.systemui.accessibility; package com.android.systemui.accessibility;
import static android.provider.Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_NONE;
import static android.provider.Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW; import static android.provider.Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW;
import android.annotation.NonNull; import android.annotation.NonNull;
@@ -70,7 +71,7 @@ class MagnificationModeSwitch implements MagnificationGestureDetector.OnGestureL
private final ImageView mImageView; private final ImageView mImageView;
private final Runnable mWindowInsetChangeRunnable; private final Runnable mWindowInsetChangeRunnable;
private final SfVsyncFrameCallbackProvider mSfVsyncFrameProvider; private final SfVsyncFrameCallbackProvider mSfVsyncFrameProvider;
private int mMagnificationMode = Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN; private int mMagnificationMode = ACCESSIBILITY_MAGNIFICATION_MODE_NONE;
private final LayoutParams mParams; private final LayoutParams mParams;
@VisibleForTesting @VisibleForTesting
final Rect mDraggableWindowBounds = new Rect(); final Rect mDraggableWindowBounds = new Rect();

10
packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java
View File

@@ -100,8 +100,6 @@ public class MagnificationModeSwitchTest extends SysuiTestCase {
private AccessibilityManager mAccessibilityManager; private AccessibilityManager mAccessibilityManager;
@Mock @Mock
private SfVsyncFrameCallbackProvider mSfVsyncFrameProvider; private SfVsyncFrameCallbackProvider mSfVsyncFrameProvider;
@Mock
private Handler mHandler;
private TestableWindowManager mWindowManager; private TestableWindowManager mWindowManager;
private ViewPropertyAnimator mViewPropertyAnimator; private ViewPropertyAnimator mViewPropertyAnimator;
private MagnificationModeSwitch mMagnificationModeSwitch; private MagnificationModeSwitch mMagnificationModeSwitch;
@@ -152,12 +150,12 @@ public class MagnificationModeSwitchTest extends SysuiTestCase {
} }
@Test @Test
public void showWindowModeButton_fullscreenMode_addViewAndSetImageResource() { public void showFullscreenModeButton_addViewAndSetImageResource() {
mMagnificationModeSwitch.showButton(ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW); mMagnificationModeSwitch.showButton(ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);
verify(mSpyImageView).setImageResource( verify(mSpyImageView).setImageResource(
getIconResId(ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW)); getIconResId(ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN));
verify(mWindowManager).addView(eq(mSpyImageView), any(WindowManager.LayoutParams.class)); assertEquals(mSpyImageView, mWindowManager.getAttachedView());
assertShowFadingAnimation(FADE_IN_ALPHA); assertShowFadingAnimation(FADE_IN_ALPHA);
assertShowFadingAnimation(FADE_OUT_ALPHA); assertShowFadingAnimation(FADE_OUT_ALPHA);
} }