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

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

Merge "refactor(magnification): Renaming WindowMagnification class as Magnification" into main

parents 91400a46 2ae44393

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

+45 −41
Original line number Diff line number Diff line
@@ -59,8 +59,8 @@ import javax.inject.Inject; 
 * when {@code IStatusBar#requestWindowMagnificationConnection(boolean)} is called.

 */

@SysUISingleton

public class WindowMagnification implements CoreStartable, CommandQueue.Callbacks {

    private static final String TAG = "WindowMagnification";

public class Magnification implements CoreStartable, CommandQueue.Callbacks {

    private static final String TAG = "Magnification";



    private final ModeSwitchesController mModeSwitchesController;

    private final Context mContext;
@@ -154,7 +154,7 @@ public class WindowMagnification implements CoreStartable, CommandQueue.Callback 
    DisplayIdIndexSupplier<MagnificationSettingsController> mMagnificationSettingsSupplier;



    @Inject

    public WindowMagnification(Context context, @Main Handler mainHandler,

    public Magnification(Context context, @Main Handler mainHandler,

            CommandQueue commandQueue, ModeSwitchesController modeSwitchesController,

            SysUiState sysUiState, OverviewProxyService overviewProxyService,

            SecureSettings secureSettings, DisplayTracker displayTracker,
@@ -384,12 +384,16 @@ public class WindowMagnification implements CoreStartable, CommandQueue.Callback 
                public void onEditMagnifierSizeMode(int displayId, boolean enable) {

                    mHandler.post(() -> onEditMagnifierSizeModeInternal(displayId, enable));

                    mA11yLogger.log(enable

                    ? MagnificationSettingsEvent.MAGNIFICATION_SETTINGS_SIZE_EDITING_ACTIVATED

                    : MagnificationSettingsEvent.MAGNIFICATION_SETTINGS_SIZE_EDITING_DEACTIVATED);

                            ?

                            MagnificationSettingsEvent

                                    .MAGNIFICATION_SETTINGS_SIZE_EDITING_ACTIVATED

                            : MagnificationSettingsEvent

                                    .MAGNIFICATION_SETTINGS_SIZE_EDITING_DEACTIVATED);

                }



                @Override

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

                public void onMagnifierScale(int displayId, float scale,

                        boolean updatePersistence) {

                    if (mWindowMagnificationConnectionImpl != null) {

                        mWindowMagnificationConnectionImpl.onPerformScaleAction(

                                displayId, scale, updatePersistence);

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

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import com.android.systemui.util.settings.SecureSettings; 
 * A class to control {@link WindowMagnificationSettings} and receive settings panel callbacks by

 * {@link WindowMagnificationSettingsCallback}.

 * The settings panel callbacks will be delegated through

 * {@link MagnificationSettingsController.Callback} to {@link WindowMagnification}.

 * {@link MagnificationSettingsController.Callback} to {@link Magnification}.

 */



public class MagnificationSettingsController implements ComponentCallbacks {

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

+12 −12
Original line number Diff line number Diff line
@@ -37,12 +37,12 @@ class WindowMagnificationConnectionImpl extends IWindowMagnificationConnection.S 
    private static final String TAG = "WindowMagnificationConnectionImpl";



    private IWindowMagnificationConnectionCallback mConnectionCallback;

    private final WindowMagnification mWindowMagnification;

    private final Magnification mMagnification;

    private final Handler mHandler;



    WindowMagnificationConnectionImpl(@NonNull WindowMagnification windowMagnification,

    WindowMagnificationConnectionImpl(@NonNull Magnification magnification,

            @Main Handler mainHandler) {

        mWindowMagnification = windowMagnification;

        mMagnification = magnification;

        mHandler = mainHandler;

    }
@@ -51,56 +51,56 @@ class WindowMagnificationConnectionImpl extends IWindowMagnificationConnection.S 
            float magnificationFrameOffsetRatioX, float magnificationFrameOffsetRatioY,

            IRemoteMagnificationAnimationCallback callback) {

        mHandler.post(

                () -> mWindowMagnification.enableWindowMagnification(displayId, scale, centerX,

                () -> mMagnification.enableWindowMagnification(displayId, scale, centerX,

                        centerY, magnificationFrameOffsetRatioX,

                        magnificationFrameOffsetRatioY, callback));

    }



    @Override

    public void setScale(int displayId, float scale) {

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

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

    }



    @Override

    public void disableWindowMagnification(int displayId,

            IRemoteMagnificationAnimationCallback callback) {

        mHandler.post(() -> mWindowMagnification.disableWindowMagnification(displayId,

        mHandler.post(() -> mMagnification.disableWindowMagnification(displayId,

                callback));

    }



    @Override

    public void moveWindowMagnifier(int displayId, float offsetX, float offsetY) {

        mHandler.post(

                () -> mWindowMagnification.moveWindowMagnifier(displayId, offsetX, offsetY));

                () -> mMagnification.moveWindowMagnifier(displayId, offsetX, offsetY));

    }



    @Override

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

            IRemoteMagnificationAnimationCallback callback) {

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

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

                displayId, positionX, positionY, callback));

    }



    @Override

    public void showMagnificationButton(int displayId, int magnificationMode) {

        mHandler.post(

                () -> mWindowMagnification.showMagnificationButton(displayId, magnificationMode));

                () -> mMagnification.showMagnificationButton(displayId, magnificationMode));

    }



    @Override

    public void removeMagnificationButton(int displayId) {

        mHandler.post(

                () -> mWindowMagnification.removeMagnificationButton(displayId));

                () -> mMagnification.removeMagnificationButton(displayId));

    }



    @Override

    public void removeMagnificationSettingsPanel(int display) {

        mHandler.post(() -> mWindowMagnification.hideMagnificationSettingsPanel(display));

        mHandler.post(() -> mMagnification.hideMagnificationSettingsPanel(display));

    }



    @Override

    public void onUserMagnificationScaleChanged(int userId, int displayId, float scale) {

        mHandler.post(() -> mWindowMagnification.setUserMagnificationScale(

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

                userId, displayId, scale));

    }

packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt

+4 −4
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import com.android.systemui.LatencyTester 
import com.android.systemui.ScreenDecorations

import com.android.systemui.SliceBroadcastRelayHandler

import com.android.systemui.accessibility.SystemActions

import com.android.systemui.accessibility.WindowMagnification

import com.android.systemui.accessibility.Magnification

import com.android.systemui.back.domain.interactor.BackActionInteractor

import com.android.systemui.biometrics.AuthController

import com.android.systemui.biometrics.BiometricNotificationService
@@ -254,11 +254,11 @@ abstract class SystemUICoreStartableModule { 
    @ClassKey(VolumeUI::class)

    abstract fun bindVolumeUI(sysui: VolumeUI): CoreStartable



    /** Inject into WindowMagnification.  */

    /** Inject into Magnification.  */

    @Binds

    @IntoMap

    @ClassKey(WindowMagnification::class)

    abstract fun bindWindowMagnification(sysui: WindowMagnification): CoreStartable

    @ClassKey(Magnification::class)

    abstract fun bindMagnification(sysui: Magnification): CoreStartable



    /** Inject into WMShell.  */

    @Binds

packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java

+3 −3
Original line number Diff line number Diff line
@@ -75,14 +75,14 @@ import com.android.systemui.statusbar.CommandQueue.Callbacks; 
import com.android.systemui.statusbar.commandline.CommandRegistry;

import com.android.systemui.statusbar.policy.CallbackController;



import dagger.Lazy;



import java.io.FileDescriptor;

import java.io.FileOutputStream;

import java.io.OutputStream;

import java.io.PrintWriter;

import java.util.ArrayList;



import dagger.Lazy;



/**

 * This class takes the functions from IStatusBar that come in on

 * binder pool threads and posts messages to get them onto the main
@@ -424,7 +424,7 @@ public class CommandQueue extends IStatusBar.Stub implements 
        default void onTracingStateChanged(boolean enabled) { }



        /**

         * Requests {@link com.android.systemui.accessibility.WindowMagnification} to invoke

         * Requests {@link com.android.systemui.accessibility.Magnification} to invoke

         * {@code android.view.accessibility.AccessibilityManager#

         * setWindowMagnificationConnection(IWindowMagnificationConnection)}

         *