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

Commit 1ff7172a authored by Candice Lo's avatar Candice Lo
Browse files

refactor(magnification): Renaming WindowMagnificationConnectionImpl class as... 

refactor(magnification): Renaming WindowMagnificationConnectionImpl class as MagnificationConnectionImpl

The connection handles stuffs more than magnification window mode. Therefore, we would like to rename the class to improve the readability of our codebase and avoid confusion.

Bug: 310109308
Test: manually. Renaming the class
      atest MagnificationTest
      atest MagnificationSettingsControllerTest
      atest WindowMagnificationSettingsTest
      atest WindowMagnificationControllerTest
      atest MagnificationconnectionManagerTest
      atest MagnificationControllerTest
Flag: NA
Change-Id: I1360adabf6c2d80c69d2390b6b842c01391d6139
parent b0fecc88

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

+18 −18
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class Magnification implements CoreStartable, CommandQueue.Callbacks { 
    private final DisplayTracker mDisplayTracker;

    private final AccessibilityLogger mA11yLogger;



    private WindowMagnificationConnectionImpl mWindowMagnificationConnectionImpl;

    private MagnificationConnectionImpl mMagnificationConnectionImpl;

    private SysUiState mSysUiState;



    @VisibleForTesting
@@ -321,37 +321,37 @@ public class Magnification implements CoreStartable, CommandQueue.Callbacks { 
    final WindowMagnifierCallback mWindowMagnifierCallback = new WindowMagnifierCallback() {

        @Override

        public void onWindowMagnifierBoundsChanged(int displayId, Rect frame) {

            if (mWindowMagnificationConnectionImpl != null) {

                mWindowMagnificationConnectionImpl.onWindowMagnifierBoundsChanged(displayId, frame);

            if (mMagnificationConnectionImpl != null) {

                mMagnificationConnectionImpl.onWindowMagnifierBoundsChanged(displayId, frame);

            }

        }



        @Override

        public void onSourceBoundsChanged(int displayId, Rect sourceBounds) {

            if (mWindowMagnificationConnectionImpl != null) {

                mWindowMagnificationConnectionImpl.onSourceBoundsChanged(displayId, sourceBounds);

            if (mMagnificationConnectionImpl != null) {

                mMagnificationConnectionImpl.onSourceBoundsChanged(displayId, sourceBounds);

            }

        }



        @Override

        public void onPerformScaleAction(int displayId, float scale, boolean updatePersistence) {

            if (mWindowMagnificationConnectionImpl != null) {

                mWindowMagnificationConnectionImpl.onPerformScaleAction(

            if (mMagnificationConnectionImpl != null) {

                mMagnificationConnectionImpl.onPerformScaleAction(

                        displayId, scale, updatePersistence);

            }

        }



        @Override

        public void onAccessibilityActionPerformed(int displayId) {

            if (mWindowMagnificationConnectionImpl != null) {

                mWindowMagnificationConnectionImpl.onAccessibilityActionPerformed(displayId);

            if (mMagnificationConnectionImpl != null) {

                mMagnificationConnectionImpl.onAccessibilityActionPerformed(displayId);

            }

        }



        @Override

        public void onMove(int displayId) {

            if (mWindowMagnificationConnectionImpl != null) {

                mWindowMagnificationConnectionImpl.onMove(displayId);

            if (mMagnificationConnectionImpl != null) {

                mMagnificationConnectionImpl.onMove(displayId);

            }

        }
@@ -394,8 +394,8 @@ public class Magnification implements CoreStartable, CommandQueue.Callbacks { 
                @Override

                public void onMagnifierScale(int displayId, float scale,

                        boolean updatePersistence) {

                    if (mWindowMagnificationConnectionImpl != null) {

                        mWindowMagnificationConnectionImpl.onPerformScaleAction(

                    if (mMagnificationConnectionImpl != null) {

                        mMagnificationConnectionImpl.onPerformScaleAction(

                                displayId, scale, updatePersistence);

                    }

                    mA11yLogger.logThrottled(
@@ -454,8 +454,8 @@ public class Magnification implements CoreStartable, CommandQueue.Callbacks { 
            if (magnificationSettingsController != null) {

                magnificationSettingsController.closeMagnificationSettings();

            }

            if (mWindowMagnificationConnectionImpl != null) {

                mWindowMagnificationConnectionImpl.onChangeMagnificationMode(displayId, newMode);

            if (mMagnificationConnectionImpl != null) {

                mMagnificationConnectionImpl.onChangeMagnificationMode(displayId, newMode);

            }

        }

    }
@@ -500,12 +500,12 @@ public class Magnification implements CoreStartable, CommandQueue.Callbacks { 
    }



    private void setWindowMagnificationConnection() {

        if (mWindowMagnificationConnectionImpl == null) {

            mWindowMagnificationConnectionImpl = new WindowMagnificationConnectionImpl(this,

        if (mMagnificationConnectionImpl == null) {

            mMagnificationConnectionImpl = new MagnificationConnectionImpl(this,

                    mHandler);

        }

        mAccessibilityManager.setWindowMagnificationConnection(

                mWindowMagnificationConnectionImpl);

                mMagnificationConnectionImpl);

    }



    private void clearWindowMagnificationConnection() {

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

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import com.android.systemui.dagger.qualifiers.Main; 
 *

 * @see IWindowMagnificationConnection

 */

class WindowMagnificationConnectionImpl extends IWindowMagnificationConnection.Stub {

class MagnificationConnectionImpl extends IWindowMagnificationConnection.Stub {



    private static final String TAG = "WindowMagnificationConnectionImpl";
@@ -40,7 +40,7 @@ class WindowMagnificationConnectionImpl extends IWindowMagnificationConnection.S 
    private final Magnification mMagnification;

    private final Handler mHandler;



    WindowMagnificationConnectionImpl(@NonNull Magnification magnification,

    MagnificationConnectionImpl(@NonNull Magnification magnification,

            @Main Handler mainHandler) {

        mMagnification = magnification;

        mHandler = mainHandler;