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

Commit 28978722 authored by Treehugger Robot's avatar Treehugger Robot Committed by Josh Yang
Browse files

Make AccessibilityModule optional. 

Wear has its different implementation of Magnification border. So this
change does following things to unblock wear customization:

1. Change Magnification from a class to interface to allow wear creating
   alternative implementaiton.
2. Make AccessibilityModule part of ReferenceSystemUIModule instead of
   the base SystemUIModule. This allows wear to insert its own
   accessibility module without inheriting the default module.

Flag: EXEMPT refactor
Bug: 331679109
Test: build success + manual test
Test: atest MagnificationTest
Change-Id: I795a1cef0513f7f5f929eb192f49ef10c8502e65
parent a514bd3b

packages/SystemUI/src/com/android/systemui/accessibility/AccessibilityModule.kt

+3 −0
Original line number Diff line number Diff line
@@ -42,4 +42,7 @@ interface AccessibilityModule { 
    fun accessibilityQsShortcutsRepository(

        impl: AccessibilityQsShortcutsRepositoryImpl

    ): AccessibilityQsShortcutsRepository



    @Binds

    fun magnification(impl: MagnificationImpl): Magnification

}

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

+3 −3
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ import com.android.systemui.util.leak.RotationUtils; 
import java.util.concurrent.Executor;

import java.util.function.Supplier;



class FullscreenMagnificationController implements ComponentCallbacks {

public class FullscreenMagnificationController implements ComponentCallbacks {



    private static final String TAG = "FullscreenMagnificationController";

    private final Context mContext;
@@ -87,7 +87,7 @@ class FullscreenMagnificationController implements ComponentCallbacks { 
    };

    private final long mLongAnimationTimeMs;



    FullscreenMagnificationController(

    public FullscreenMagnificationController(

            @UiContext Context context,

            @Main Handler handler,

            @Main Executor executor,
@@ -157,7 +157,7 @@ class FullscreenMagnificationController implements ComponentCallbacks { 
     * there is an activation change.

     */

    @UiThread

    void onFullscreenMagnificationActivationChanged(boolean activated) {

    public void onFullscreenMagnificationActivationChanged(boolean activated) {

        final boolean changed = (mFullscreenMagnificationActivated != activated);

        if (changed) {

            mFullscreenMagnificationActivated = activated;

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

+24 −588

File changed.

Preview size limit exceeded, changes collapsed.

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

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

 * @see IMagnificationConnection

 */

class MagnificationConnectionImpl extends IMagnificationConnection.Stub {

public class MagnificationConnectionImpl extends IMagnificationConnection.Stub {



    private static final String TAG = "WindowMagnificationConnectionImpl";
@@ -40,7 +40,7 @@ class MagnificationConnectionImpl extends IMagnificationConnection.Stub { 
    private final Magnification mMagnification;

    private final Handler mHandler;



    MagnificationConnectionImpl(@NonNull Magnification magnification,

    public MagnificationConnectionImpl(@NonNull Magnification magnification,

            @Main Handler mainHandler) {

        mMagnification = magnification;

        mHandler = mainHandler;
@@ -83,7 +83,7 @@ class MagnificationConnectionImpl extends IMagnificationConnection.Stub { 
    @Override

    public void moveWindowMagnifierToPosition(int displayId, float positionX, float positionY,

            IRemoteMagnificationAnimationCallback callback) {

        mHandler.post(() -> mMagnification.moveWindowMagnifierToPositionInternal(

        mHandler.post(() -> mMagnification.moveWindowMagnifierToPosition(

                displayId, positionX, positionY, callback));

    }

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

0 → 100644
+641 −0

File added.

Preview size limit exceeded, changes collapsed.