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

Commit 941937ee authored by Minche Li's avatar Minche Li Committed by Automerger Merge Worker
Browse files

Merge "Assigns the default value of the cache magnification mode" into sc-dev... 

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

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

Change-Id: Ibea66c9def40f76f71da699c24b209447be91af5
parents 2c073366 fc42ac85

packages/SystemUI/src/com/android/systemui/accessibility/MagnificationModeSwitch.java

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


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 android.annotation.NonNull;
@@ -70,7 +71,7 @@ class MagnificationModeSwitch implements MagnificationGestureDetector.OnGestureL 
    private final ImageView mImageView;

    private final Runnable mWindowInsetChangeRunnable;

    private final SfVsyncFrameCallbackProvider mSfVsyncFrameProvider;

    private int mMagnificationMode = Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN;

    private int mMagnificationMode = ACCESSIBILITY_MAGNIFICATION_MODE_NONE;

    private final LayoutParams mParams;

    @VisibleForTesting

    final Rect mDraggableWindowBounds = new Rect();

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

+4 −6
Original line number Diff line number Diff line
@@ -100,8 +100,6 @@ public class MagnificationModeSwitchTest extends SysuiTestCase { 
    private AccessibilityManager mAccessibilityManager;

    @Mock

    private SfVsyncFrameCallbackProvider mSfVsyncFrameProvider;

    @Mock

    private Handler mHandler;

    private TestableWindowManager mWindowManager;

    private ViewPropertyAnimator mViewPropertyAnimator;

    private MagnificationModeSwitch mMagnificationModeSwitch;
@@ -152,12 +150,12 @@ public class MagnificationModeSwitchTest extends SysuiTestCase { 
    }



    @Test

    public void showWindowModeButton_fullscreenMode_addViewAndSetImageResource() {

        mMagnificationModeSwitch.showButton(ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW);

    public void showFullscreenModeButton_addViewAndSetImageResource() {

        mMagnificationModeSwitch.showButton(ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);



        verify(mSpyImageView).setImageResource(

                getIconResId(ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW));

        verify(mWindowManager).addView(eq(mSpyImageView), any(WindowManager.LayoutParams.class));

                getIconResId(ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN));

        assertEquals(mSpyImageView, mWindowManager.getAttachedView());

        assertShowFadingAnimation(FADE_IN_ALPHA);

        assertShowFadingAnimation(FADE_OUT_ALPHA);

    }