diff options
| author | 2024-11-27 19:39:12 +0000 | |
|---|---|---|
| committer | 2024-11-27 19:39:12 +0000 | |
| commit | badee29d4845057f95dafab58d1b46f6c8565fdb (patch) | |
| tree | cf88195f612e87e233eba393bdfb777e7d96efdc | |
| parent | 5c01cd5adc7cd84f2e742562d37aab1490911519 (diff) | |
| parent | 8d52b3e127b7b5dd8078058c4d2f075fffa3b490 (diff) | |
Merge "Cleanup flag "create_windowless_window_magnifier"" into main
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/accessibility/MagnificationImpl.java | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationImpl.java b/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationImpl.java index 3cf400aa5c16..5b433464c1c6 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationImpl.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationImpl.java @@ -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, - /* options */ null); + 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, |