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

Commit 54dfc252 authored by Roy Chou's avatar Roy Chou Committed by Android (Google) Code Review
Browse files

Merge "fix(magnification): stub mock settings controller object method in... 

Merge "fix(magnification): stub mock settings controller object method in IMagnificationConnectionTest" into main
parents eab981a1 d7f40594

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/IMagnificationConnectionTest.java

+2 −5
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.systemui.accessibility; 
import static com.android.systemui.accessibility.MagnificationImpl.DELAY_SHOW_MAGNIFICATION_TIMEOUT_MS;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.any;
@@ -190,8 +189,7 @@ public class IMagnificationConnectionTest extends SysuiTestCase { 


    @Test

    public void showMagnificationButton_delayedShowButton() throws RemoteException {

        // magnification settings panel should not be showing

        assertFalse(mMagnification.isMagnificationSettingsPanelShowing(TEST_DISPLAY));

        when(mMagnificationSettingsController.isMagnificationSettingsShowing()).thenReturn(false);



        mIMagnificationConnection.showMagnificationButton(TEST_DISPLAY,

                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);
@@ -237,8 +235,7 @@ public class IMagnificationConnectionTest extends SysuiTestCase { 
    @Test

    public void removeMagnificationButton_delayingShowButton_doNotShowButtonAfterTimeout()

            throws RemoteException {

        // magnification settings panel should not be showing

        assertFalse(mMagnification.isMagnificationSettingsPanelShowing(TEST_DISPLAY));

        when(mMagnificationSettingsController.isMagnificationSettingsShowing()).thenReturn(false);



        mIMagnificationConnection.showMagnificationButton(TEST_DISPLAY,

                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);

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

+2 −1
Original line number Diff line number Diff line
@@ -403,7 +403,8 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks 
        }

    }



    boolean isMagnificationSettingsPanelShowing(int displayId) {

    @MainThread

    private boolean isMagnificationSettingsPanelShowing(int displayId) {

        final MagnificationSettingsController magnificationSettingsController =

                mMagnificationSettingsSupplier.get(displayId);

        if (magnificationSettingsController != null) {