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

Commit 3323fd31 authored by Candice Lo's avatar Candice Lo
Browse files

refactor(magnification): Rename methods setScale based on its targets 

We would like to rename the methods setScale() as setScaleForWindowMagnification() to provide more precise method names.

Bug: 310109308
Test: manually. Renaming methods
      atest MagnificationTest
      atest MagnificationConnectionManagerTest
      atest MagnificationControllerTest
      atest WindowMagnificationControllerTest
      atest MagnificationConnectionWrapperTest
Flag: NA
Change-Id: I0fca90e2f3e99685dc90ea5df03414fb72c6c4a0
parent 1ff7172a

core/java/android/view/accessibility/IWindowMagnificationConnection.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ oneway interface IWindowMagnificationConnection { 
     * @param displayId the logical display id.

     * @param displayId the logical display id.

     * @param scale magnification scale.

     * @param scale magnification scale.

     */

     */

    void setScale(int displayId, float scale);

    void setScaleForWindowMagnification(int displayId, float scale);





     /**

     /**

     * Disables window magnification on specified display with animation.

     * Disables window magnification on specified display with animation.

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -220,7 +220,7 @@ public class Magnification implements CoreStartable, CommandQueue.Callbacks { 
    }

    }





    @MainThread

    @MainThread

    void setScale(int displayId, float scale) {

    void setScaleForWindowMagnification(int displayId, float scale) {

        final WindowMagnificationController windowMagnificationController =

        final WindowMagnificationController windowMagnificationController =

                mMagnificationControllerSupplier.get(displayId);

                mMagnificationControllerSupplier.get(displayId);

        if (windowMagnificationController != null) {

        if (windowMagnificationController != null) {

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -57,8 +57,8 @@ class MagnificationConnectionImpl extends IWindowMagnificationConnection.Stub { 
    }

    }





    @Override

    @Override

    public void setScale(int displayId, float scale) {

    public void setScaleForWindowMagnification(int displayId, float scale) {

        mHandler.post(() -> mMagnification.setScale(displayId, scale));

        mHandler.post(() -> mMagnification.setScaleForWindowMagnification(displayId, scale));

    }

    }





    @Override

    @Override

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -133,8 +133,8 @@ public class IWindowMagnificationConnectionTest extends SysuiTestCase { 
    }

    }





    @Test

    @Test

    public void setScale() throws RemoteException {

    public void setScaleForWindowMagnification() throws RemoteException {

        mIWindowMagnificationConnection.setScale(TEST_DISPLAY, 3.0f);

        mIWindowMagnificationConnection.setScaleForWindowMagnification(TEST_DISPLAY, 3.0f);

        waitForIdleSync();

        waitForIdleSync();





        verify(mWindowMagnificationController).setScale(3.0f);

        verify(mWindowMagnificationController).setScale(3.0f);

services/accessibility/java/com/android/server/accessibility/magnification/MagnificationConnectionManager.java

+6 −3
Original line number Original line Diff line number Diff line
@@ -1130,7 +1130,8 @@ public class MagnificationConnectionManager implements 
            }

            }

            final float normScale = MagnificationScaleProvider.constrainScale(scale);

            final float normScale = MagnificationScaleProvider.constrainScale(scale);

            if (Float.compare(mScale, normScale) != 0

            if (Float.compare(mScale, normScale) != 0

                    && mMagnificationConnectionManager.setScaleInternal(mDisplayId, scale)) {

                    && mMagnificationConnectionManager

                        .setScaleForWindowMagnificationInternal(mDisplayId, scale)) {

                mScale = normScale;

                mScale = normScale;

            }

            }

        }

        }
@@ -1286,8 +1287,10 @@ public class MagnificationConnectionManager implements 
                animationCallback);

                animationCallback);

    }

    }





    private boolean setScaleInternal(int displayId, float scale) {

    @GuardedBy("mLock")

        return mConnectionWrapper != null && mConnectionWrapper.setScale(displayId, scale);

    private boolean setScaleForWindowMagnificationInternal(int displayId, float scale) {

        return mConnectionWrapper != null

                && mConnectionWrapper.setScaleForWindowMagnification(displayId, scale);

    }

    }





    @GuardedBy("mLock")

    @GuardedBy("mLock")