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

Commit 7e320ece authored by Archisha Baranwal's avatar Archisha Baranwal Committed by Android (Google) Code Review
Browse files

Merge changes from topic "WindowMagnificationSettingsFix" into main 

* changes:
  Fix WindowManager instance used in WindowMagnificationSettings window.
  Revert "Removing use of WindowManagerProvider to create window manager for"
parents 67f2f46c 4257ebc0

packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuOverlayLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ public class A11yMenuOverlayLayout { 
        final Display display = mDisplayManager.getDisplay(DEFAULT_DISPLAY);

        final Context uiContext = mService.createWindowContext(

                display, TYPE_ACCESSIBILITY_OVERLAY, /* options= */null);

        final WindowManager windowManager = uiContext.getSystemService(WindowManager.class);

        final WindowManager windowManager = WindowManagerUtils.getWindowManager(uiContext);

        mLayout = new A11yMenuFrameLayout(uiContext);

        updateLayoutPosition(uiContext);

        inflateLayoutAndSetOnTouchListener(mLayout, uiContext);

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/MagnificationSettingsControllerTest.java

+5 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static org.mockito.Mockito.verify; 


import android.content.pm.ActivityInfo;

import android.testing.TestableLooper;

import android.view.WindowManager;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;
@@ -31,6 +32,7 @@ import com.android.internal.graphics.SfVsyncFrameCallbackProvider; 
import com.android.systemui.SysuiTestCase;

import com.android.systemui.accessibility.WindowMagnificationSettings.MagnificationSize;

import com.android.systemui.util.settings.SecureSettings;

import com.android.systemui.utils.windowmanager.WindowManagerProvider;



import org.junit.After;

import org.junit.Before;
@@ -56,13 +58,15 @@ public class MagnificationSettingsControllerTest extends SysuiTestCase { 
    private SfVsyncFrameCallbackProvider mSfVsyncFrameProvider;

    @Mock

    private SecureSettings mSecureSettings;

    @Mock

    private WindowManagerProvider mWindowManagerProvider;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mMagnificationSettingsController = new MagnificationSettingsController(

                mContext, mSfVsyncFrameProvider,

                mMagnificationSettingControllerCallback, mSecureSettings,

                mMagnificationSettingControllerCallback, mSecureSettings, mWindowManagerProvider,

                mWindowMagnificationSettings);

    }

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

+27 −13
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import com.android.systemui.recents.LauncherProxyService; 
import com.android.systemui.settings.DisplayTracker;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.util.settings.SecureSettings;

import com.android.systemui.utils.windowmanager.WindowManagerProvider;



import java.io.PrintWriter;

import java.util.concurrent.Executor;
@@ -96,17 +97,19 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks 
        private final WindowMagnifierCallback mWindowMagnifierCallback;

        private final SysUiState mSysUiState;

        private final SecureSettings mSecureSettings;

        private final WindowManagerProvider mWindowManagerProvider;



        WindowMagnificationControllerSupplier(Context context, Handler handler,

                WindowMagnifierCallback windowMagnifierCallback,

                DisplayManager displayManager, SysUiState sysUiState,

                SecureSettings secureSettings) {

                SecureSettings secureSettings, WindowManagerProvider windowManagerProvider) {

            super(displayManager);

            mContext = context;

            mHandler = handler;

            mWindowMagnifierCallback = windowMagnifierCallback;

            mSysUiState = sysUiState;

            mSecureSettings = secureSettings;

            mWindowManagerProvider = windowManagerProvider;

        }



        @Override
@@ -114,8 +117,9 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks 
            final Context windowContext = mContext.createWindowContext(display,

                        TYPE_ACCESSIBILITY_OVERLAY,

                        /* options */ null);

            final WindowManager windowManager = mWindowManagerProvider

                    .getWindowManager(windowContext);

            windowContext.setTheme(com.android.systemui.res.R.style.Theme_SystemUI);

            final WindowManager windowManager = windowContext.getSystemService(WindowManager.class);



            Supplier<SurfaceControlViewHost> scvhSupplier = () ->

                    new SurfaceControlViewHost(mContext,
@@ -146,17 +150,20 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks 
        private final Executor mExecutor;

        private final DisplayManager mDisplayManager;

        private final IWindowManager mIWindowManager;

        private final WindowManagerProvider mWindowManagerProvider;



        FullscreenMagnificationControllerSupplier(Context context,

                DisplayManager displayManager,

                Handler handler,

                Executor executor, IWindowManager iWindowManager) {

                Executor executor, IWindowManager iWindowManager,

                WindowManagerProvider windowManagerProvider) {

            super(displayManager);

            mContext = context;

            mHandler = handler;

            mExecutor = executor;

            mDisplayManager = displayManager;

            mIWindowManager = iWindowManager;

            mWindowManagerProvider = windowManagerProvider;

        }



        @Override
@@ -172,7 +179,7 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks 
                    mExecutor,

                    mDisplayManager,

                    windowContext.getSystemService(AccessibilityManager.class),

                    windowContext.getSystemService(WindowManager.class),

                    mWindowManagerProvider.getWindowManager(windowContext),

                    mIWindowManager,

                    scvhSupplier);

        }
@@ -188,15 +195,17 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks 
        private final Context mContext;

        private final MagnificationSettingsController.Callback mSettingsControllerCallback;

        private final SecureSettings mSecureSettings;

        private final WindowManagerProvider mWindowManagerProvider;



        SettingsSupplier(Context context,

                MagnificationSettingsController.Callback settingsControllerCallback,

                DisplayManager displayManager,

                SecureSettings secureSettings) {

                SecureSettings secureSettings, WindowManagerProvider windowManagerProvider) {

            super(displayManager);

            mContext = context;

            mSettingsControllerCallback = settingsControllerCallback;

            mSecureSettings = secureSettings;

            mWindowManagerProvider = windowManagerProvider;

        }



        @Override
@@ -204,12 +213,12 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks 
            final Context windowContext = mContext.createWindowContext(display,

                    TYPE_ACCESSIBILITY_OVERLAY, /* options */ null);

            windowContext.setTheme(com.android.systemui.res.R.style.Theme_SystemUI);



            return new MagnificationSettingsController(

                    windowContext,

                    new SfVsyncFrameCallbackProvider(),

                    mSettingsControllerCallback,

                    mSecureSettings);

                    mSecureSettings,

                    mWindowManagerProvider);

        }

    }
@@ -223,10 +232,12 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks 
            SysUiState sysUiState, LauncherProxyService launcherProxyService,

            SecureSettings secureSettings, DisplayTracker displayTracker,

            DisplayManager displayManager, AccessibilityLogger a11yLogger,

            IWindowManager iWindowManager, AccessibilityManager accessibilityManager) {

            IWindowManager iWindowManager, AccessibilityManager accessibilityManager,

            WindowManagerProvider windowManagerProvider) {

        this(context, mainHandler.getLooper(), executor, commandQueue,

                modeSwitchesController, sysUiState, launcherProxyService, secureSettings,

                displayTracker, displayManager, a11yLogger, iWindowManager, accessibilityManager);

                displayTracker, displayManager, a11yLogger, iWindowManager, accessibilityManager,

                windowManagerProvider);

    }



    @VisibleForTesting
@@ -236,7 +247,8 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks 
            SecureSettings secureSettings, DisplayTracker displayTracker,

            DisplayManager displayManager, AccessibilityLogger a11yLogger,

            IWindowManager iWindowManager,

            AccessibilityManager accessibilityManager) {

            AccessibilityManager accessibilityManager,

            WindowManagerProvider windowManagerProvider) {

        mHandler = new Handler(looper) {

            @Override

            public void handleMessage(@NonNull Message msg) {
@@ -255,11 +267,13 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks 
        mA11yLogger = a11yLogger;

        mWindowMagnificationControllerSupplier = new WindowMagnificationControllerSupplier(context,

                mHandler, mWindowMagnifierCallback,

                displayManager, sysUiState, secureSettings);

                displayManager, sysUiState, secureSettings, windowManagerProvider);

        mFullscreenMagnificationControllerSupplier = new FullscreenMagnificationControllerSupplier(

                context, displayManager, mHandler, mExecutor, iWindowManager);

                context, displayManager, mHandler, mExecutor, iWindowManager,

                windowManagerProvider);

        mMagnificationSettingsSupplier = new SettingsSupplier(context,

                mMagnificationSettingsControllerCallback, displayManager, secureSettings);

                mMagnificationSettingsControllerCallback, displayManager, secureSettings,

                windowManagerProvider);



        mModeSwitchesController.setClickListenerDelegate(

                displayId -> mHandler.post(() -> {

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

+8 −4
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.internal.accessibility.common.MagnificationConstants; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.graphics.SfVsyncFrameCallbackProvider;

import com.android.systemui.util.settings.SecureSettings;

import com.android.systemui.utils.windowmanager.WindowManagerProvider;



/**

 * A class to control {@link WindowMagnificationSettings} and receive settings panel callbacks by
@@ -60,8 +61,10 @@ public class MagnificationSettingsController implements ComponentCallbacks { 
            @UiContext Context context,

            SfVsyncFrameCallbackProvider sfVsyncFrameProvider,

            @NonNull Callback settingsControllerCallback,

            SecureSettings secureSettings) {

        this(context, sfVsyncFrameProvider, settingsControllerCallback,  secureSettings, null);

            SecureSettings secureSettings,

            WindowManagerProvider windowManagerProvider) {

        this(context, sfVsyncFrameProvider, settingsControllerCallback,  secureSettings,

                windowManagerProvider, null);

    }



    @VisibleForTesting
@@ -70,6 +73,7 @@ public class MagnificationSettingsController implements ComponentCallbacks { 
            SfVsyncFrameCallbackProvider sfVsyncFrameProvider,

            @NonNull Callback settingsControllerCallback,

            SecureSettings secureSettings,

            WindowManagerProvider windowManagerProvider,

            WindowMagnificationSettings windowMagnificationSettings) {

        mContext = context.createWindowContext(

                context.getDisplay(),
@@ -82,10 +86,10 @@ public class MagnificationSettingsController implements ComponentCallbacks { 
        if (windowMagnificationSettings != null) {

            mWindowMagnificationSettings = windowMagnificationSettings;

        } else {

            WindowManager wm = mContext.getSystemService(WindowManager.class);

            WindowManager windowManager = windowManagerProvider.getWindowManager(mContext);

            mWindowMagnificationSettings = new WindowMagnificationSettings(mContext,

                    mWindowMagnificationSettingsCallback,

                    sfVsyncFrameProvider, secureSettings, wm);

                    sfVsyncFrameProvider, secureSettings, windowManager);

        }

    }

packages/SystemUI/src/com/android/systemui/clipboardoverlay/dagger/ClipboardOverlayModule.java

+4 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.systemui.clipboardoverlay.IntentCreator; 
import com.android.systemui.res.R;

import com.android.systemui.settings.DisplayTracker;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.utils.windowmanager.WindowManagerProvider;



import dagger.Lazy;

import dagger.Module;
@@ -85,8 +86,9 @@ public interface ClipboardOverlayModule { 
     */

    @Provides

    @OverlayWindowContext

    static WindowManager provideWindowManager(@OverlayWindowContext Context context) {

        return context.getSystemService(WindowManager.class);

    static WindowManager provideWindowManager(@OverlayWindowContext Context context,

            WindowManagerProvider windowManagerProvider) {

        return windowManagerProvider.getWindowManager(context);

    }



    @Provides