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

Commit aa20bce8 authored by Candice Lo's avatar Candice Lo Committed by Android (Google) Code Review
Browse files

Merge changes I0fca90e2,I1360adab,Ie4d53ba6 into main 

* changes:
  refactor(magnification): Rename methods setScale based on its targets
  refactor(magnification): Renaming WindowMagnificationConnectionImpl class as MagnificationConnectionImpl
  refactor(magnification): Renaming WindowMagnificationManager class as MagnificationConnectionManager
parents 73022a3e 3323fd31

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

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

     * @param scale magnification scale.

     */

    void setScale(int displayId, float scale);

    void setScaleForWindowMagnification(int displayId, float scale);



     /**

     * Disables window magnification on specified display with animation.

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

+19 −19
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
@@ -220,7 +220,7 @@ public class Magnification implements CoreStartable, CommandQueue.Callbacks { 
    }



    @MainThread

    void setScale(int displayId, float scale) {

    void setScaleForWindowMagnification(int displayId, float scale) {

        final WindowMagnificationController windowMagnificationController =

                mMagnificationControllerSupplier.get(displayId);

        if (windowMagnificationController != null) {
@@ -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

+4 −4
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;
@@ -57,8 +57,8 @@ class WindowMagnificationConnectionImpl extends IWindowMagnificationConnection.S 
    }



    @Override

    public void setScale(int displayId, float scale) {

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

    public void setScaleForWindowMagnification(int displayId, float scale) {

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

    }



    @Override

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

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



    @Test

    public void setScale() throws RemoteException {

        mIWindowMagnificationConnection.setScale(TEST_DISPLAY, 3.0f);

    public void setScaleForWindowMagnification() throws RemoteException {

        mIWindowMagnificationConnection.setScaleForWindowMagnification(TEST_DISPLAY, 3.0f);

        waitForIdleSync();



        verify(mWindowMagnificationController).setScale(3.0f);

services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java

+1 −1
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo 
            final Context uiContext = displayContext.createWindowContext(

                    TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY, null /* options */);

            magnificationGestureHandler = new WindowMagnificationGestureHandler(uiContext,

                    mAms.getWindowMagnificationMgr(), mAms.getTraceManager(),

                    mAms.getMagnificationConnectionManager(), mAms.getTraceManager(),

                    mAms.getMagnificationController(),

                    detectControlGestures,

                    detectTwoFingerTripleTap,