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

Commit 43703516 authored by Bart Sears's avatar Bart Sears Committed by Android (Google) Code Review
Browse files

Merge "Removing use of WindowManagerProvider to create window manager for... 

Merge "Removing use of WindowManagerProvider to create window manager for window context." into main
parents d872ad7f a5f871fd

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 = WindowManagerUtils.getWindowManager(uiContext);

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

        mLayout = new A11yMenuFrameLayout(uiContext);

        updateLayoutPosition(uiContext);

        inflateLayoutAndSetOnTouchListener(mLayout, uiContext);

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

+1 −4
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 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;
@@ -57,15 +56,13 @@ public class MagnificationSettingsControllerTest extends SysuiTestCase { 
    private SfVsyncFrameCallbackProvider mSfVsyncFrameProvider;

    @Mock

    private SecureSettings mSecureSettings;

    @Mock

    private WindowManager mWindowManager;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mMagnificationSettingsController = new MagnificationSettingsController(

                mContext, mSfVsyncFrameProvider,

                mMagnificationSettingControllerCallback, mSecureSettings, mWindowManager,

                mMagnificationSettingControllerCallback, mSecureSettings,

                mWindowMagnificationSettings);

    }

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

+13 −29
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ 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;
@@ -97,19 +96,17 @@ 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, WindowManagerProvider windowManagerProvider) {

                SecureSettings secureSettings) {

            super(displayManager);

            mContext = context;

            mHandler = handler;

            mWindowMagnifierCallback = windowMagnifierCallback;

            mSysUiState = sysUiState;

            mSecureSettings = secureSettings;

            mWindowManagerProvider = windowManagerProvider;

        }



        @Override
@@ -117,9 +114,8 @@ 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,
@@ -150,20 +146,17 @@ 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,

                WindowManagerProvider windowManagerProvider) {

                Executor executor, IWindowManager iWindowManager) {

            super(displayManager);

            mContext = context;

            mHandler = handler;

            mExecutor = executor;

            mDisplayManager = displayManager;

            mIWindowManager = iWindowManager;

            mWindowManagerProvider = windowManagerProvider;

        }



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

                    mDisplayManager,

                    windowContext.getSystemService(AccessibilityManager.class),

                    mWindowManagerProvider.getWindowManager(windowContext),

                    windowContext.getSystemService(WindowManager.class),

                    mIWindowManager,

                    scvhSupplier);

        }
@@ -195,32 +188,28 @@ 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, WindowManagerProvider windowManagerProvider) {

                SecureSettings secureSettings) {

            super(displayManager);

            mContext = context;

            mSettingsControllerCallback = settingsControllerCallback;

            mSecureSettings = secureSettings;

            mWindowManagerProvider = windowManagerProvider;

        }



        @Override

        protected MagnificationSettingsController createInstance(Display display) {

            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);



            return new MagnificationSettingsController(

                    windowContext,

                    new SfVsyncFrameCallbackProvider(),

                    mSettingsControllerCallback,

                    mSecureSettings,

                    windowManager);

                    mSecureSettings);

        }

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

            SecureSettings secureSettings, DisplayTracker displayTracker,

            DisplayManager displayManager, AccessibilityLogger a11yLogger,

            IWindowManager iWindowManager, AccessibilityManager accessibilityManager,

            WindowManagerProvider windowManagerProvider) {

            IWindowManager iWindowManager, AccessibilityManager accessibilityManager) {

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

                modeSwitchesController, sysUiState, launcherProxyService, secureSettings,

                displayTracker, displayManager, a11yLogger, iWindowManager, accessibilityManager,

                windowManagerProvider);

                displayTracker, displayManager, a11yLogger, iWindowManager, accessibilityManager);

    }



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

            DisplayManager displayManager, AccessibilityLogger a11yLogger,

            IWindowManager iWindowManager,

            AccessibilityManager accessibilityManager,

            WindowManagerProvider windowManagerProvider) {

            AccessibilityManager accessibilityManager) {

        mHandler = new Handler(looper) {

            @Override

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

        mWindowMagnificationControllerSupplier = new WindowMagnificationControllerSupplier(context,

                mHandler, mWindowMagnifierCallback,

                displayManager, sysUiState, secureSettings, windowManagerProvider);

                displayManager, sysUiState, secureSettings);

        mFullscreenMagnificationControllerSupplier = new FullscreenMagnificationControllerSupplier(

                context, displayManager, mHandler, mExecutor, iWindowManager,

                windowManagerProvider);

                context, displayManager, mHandler, mExecutor, iWindowManager);

        mMagnificationSettingsSupplier = new SettingsSupplier(context,

                mMagnificationSettingsControllerCallback, displayManager, secureSettings,

                windowManagerProvider);

                mMagnificationSettingsControllerCallback, displayManager, secureSettings);



        mModeSwitchesController.setClickListenerDelegate(

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

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

+4 −6
Original line number Diff line number Diff line
@@ -60,10 +60,8 @@ public class MagnificationSettingsController implements ComponentCallbacks { 
            @UiContext Context context,

            SfVsyncFrameCallbackProvider sfVsyncFrameProvider,

            @NonNull Callback settingsControllerCallback,

            SecureSettings secureSettings,

            WindowManager windowManager) {

        this(context, sfVsyncFrameProvider, settingsControllerCallback,  secureSettings,

                windowManager, null);

            SecureSettings secureSettings) {

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

    }



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

            @NonNull Callback settingsControllerCallback,

            SecureSettings secureSettings,

            WindowManager windowManager,

            WindowMagnificationSettings windowMagnificationSettings) {

        mContext = context.createWindowContext(

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

            mWindowMagnificationSettings = windowMagnificationSettings;

        } else {

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

            mWindowMagnificationSettings = new WindowMagnificationSettings(mContext,

                    mWindowMagnificationSettingsCallback,

                    sfVsyncFrameProvider, secureSettings, windowManager);

                    sfVsyncFrameProvider, secureSettings, wm);

        }

    }

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

+2 −4
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 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;
@@ -86,9 +85,8 @@ public interface ClipboardOverlayModule { 
     */

    @Provides

    @OverlayWindowContext

    static WindowManager provideWindowManager(@OverlayWindowContext Context context,

            WindowManagerProvider windowManagerProvider) {

        return windowManagerProvider.getWindowManager(context);

    static WindowManager provideWindowManager(@OverlayWindowContext Context context) {

        return context.getSystemService(WindowManager.class);

    }



    @Provides