diff options
| author | 2024-11-20 00:56:53 +0000 | |
|---|---|---|
| committer | 2024-11-20 00:56:53 +0000 | |
| commit | 3ce190704e23b1b014796a88730c363c7e1e6ef1 (patch) | |
| tree | ec6b6427669bc7d9a344c0a2e76488f5c2503551 | |
| parent | 197fea126dc18584227814d3ba363bef2a2cffc0 (diff) | |
| parent | aca3912be090e9f0bc419abcb8448b403d18a19a (diff) | |
Merge "Delete unused param in MagModeSwitch#getIconResId" into main
2 files changed, 3 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationModeSwitch.java b/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationModeSwitch.java index e91bb6aefeec..4723ab958f86 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationModeSwitch.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationModeSwitch.java @@ -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; } diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java index 1ceac78af1a2..aa95abb3528f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java @@ -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); |