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

Commit 3ce19070 authored by Daniel Norman's avatar Daniel Norman Committed by Android (Google) Code Review
Browse files

Merge "Delete unused param in MagModeSwitch#getIconResId" into main

parents 197fea12 aca3912b

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

+2 −2
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ class MagnificationModeSwitch implements MagnificationGestureDetector.OnGestureL 
        }

        if (mMagnificationMode != mode) {

            mMagnificationMode = mode;

            mImageView.setImageResource(getIconResId(mMagnificationMode));

            mImageView.setImageResource(getIconResId());

        }

        if (!mIsVisible) {

            onConfigurationChanged(mContext.getResources().getConfiguration());
@@ -455,7 +455,7 @@ class MagnificationModeSwitch implements MagnificationGestureDetector.OnGestureL 
    }



    @VisibleForTesting

    static int getIconResId(int mode) { // TODO(b/242233514): delete non used param

    static int getIconResId() {

        return R.drawable.ic_open_in_new_window;

    }

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

+1 −2
Original line number Diff line number Diff line
@@ -168,8 +168,7 @@ public class MagnificationModeSwitchTest extends SysuiTestCase { 
    public void showFullscreenModeButton_addViewAndSetImageResource() {

        mMagnificationModeSwitch.showButton(ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);



        verify(mSpyImageView).setImageResource(

                getIconResId(ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN));

        verify(mSpyImageView).setImageResource(getIconResId());

        assertEquals(mSpyImageView, mWindowManager.getAttachedView());

        assertShowFadingAnimation(FADE_IN_ALPHA);

        assertShowFadingAnimation(FADE_OUT_ALPHA);