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

Commit badee29d authored by Daniel Norman's avatar Daniel Norman Committed by Android (Google) Code Review
Browse files

Merge "Cleanup flag "create_windowless_window_magnifier"" into main

parents 5c01cd5a 8d52b3e1

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

+4 −8
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.accessibility; 


import static android.provider.Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN;

import static android.provider.Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW;

import static android.view.WindowManager.LayoutParams.TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY;

import static android.view.WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY;



import static com.android.systemui.accessibility.AccessibilityLogger.MagnificationSettingsEvent;
@@ -48,7 +47,6 @@ import androidx.annotation.NonNull; 
import com.android.app.viewcapture.ViewCaptureAwareWindowManager;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.graphics.SfVsyncFrameCallbackProvider;

import com.android.systemui.Flags;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.model.SysUiState;
@@ -118,15 +116,13 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks 
        @Override

        protected WindowMagnificationController createInstance(Display display) {

            final Context windowContext = mContext.createWindowContext(display,

                    Flags.createWindowlessWindowMagnifier()

                            ? TYPE_ACCESSIBILITY_OVERLAY

                            : TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY,

                        TYPE_ACCESSIBILITY_OVERLAY,

                        /* options */ null);

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



            Supplier<SurfaceControlViewHost> scvhSupplier = () ->

                    Flags.createWindowlessWindowMagnifier() ? new SurfaceControlViewHost(mContext,

                            mContext.getDisplay(), new InputTransferToken(), TAG) : null;

                    new SurfaceControlViewHost(mContext,

                            mContext.getDisplay(), new InputTransferToken(), TAG);



            return new WindowMagnificationController(

                    windowContext,