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

Commit 86976a6d authored by Archisha Baranwal's avatar Archisha Baranwal
Browse files

Modified Revert of "Adding ViewCaptureAwareWindowManager to A11yMenuOverlayLayout window." 

This reverts commit 26bf2458.

Reason for revert: Reverting change due to the restructure of ViewCaptureAwareWindowManager ( go/wm-for-viewcapture )

Flag: com.android.systemui.enable_view_capture_tracing

Change-Id: I5260236d158eb17e68c1c3b36b9befa9bc2b3aca
parent 10481f77

packages/SystemUI/accessibility/accessibilitymenu/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ android_app { 
        "com_android_systemui_flags_lib",

        "SettingsLibDisplayUtils",

        "SettingsLibSettingsTheme",

        "SystemUI-shared-utils",

        "com_android_a11y_menu_flags_lib",

        "//frameworks/libs/systemui:view_capture",

    ],

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

+4 −9
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ import static android.view.Display.DEFAULT_DISPLAY; 
import static android.view.View.ACCESSIBILITY_LIVE_REGION_POLITE;

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



import static com.android.app.viewcapture.ViewCaptureFactory.getViewCaptureAwareWindowManagerInstance;



import static java.lang.Math.max;



import android.animation.Animator;
@@ -55,11 +53,11 @@ import android.widget.TextView; 
import androidx.annotation.NonNull;

import androidx.annotation.UiContext;



import com.android.app.viewcapture.ViewCaptureAwareWindowManager;

import com.android.systemui.accessibility.accessibilitymenu.AccessibilityMenuService;

import com.android.systemui.accessibility.accessibilitymenu.R;

import com.android.systemui.accessibility.accessibilitymenu.activity.A11yMenuSettingsActivity.A11yMenuPreferenceFragment;

import com.android.systemui.accessibility.accessibilitymenu.model.A11yMenuShortcut;

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



import java.util.ArrayList;

import java.util.List;
@@ -145,9 +143,7 @@ public class A11yMenuOverlayLayout { 
        final Display display = mDisplayManager.getDisplay(DEFAULT_DISPLAY);

        final Context uiContext = mService.createWindowContext(

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

        final ViewCaptureAwareWindowManager windowManager =

                getViewCaptureAwareWindowManagerInstance(uiContext,

                        com.android.systemui.Flags.enableViewCaptureTracing());

        final WindowManager windowManager = WindowManagerUtils.getWindowManager(uiContext);

        mLayout = new A11yMenuFrameLayout(uiContext);

        updateLayoutPosition(uiContext);

        inflateLayoutAndSetOnTouchListener(mLayout, uiContext);
@@ -162,8 +158,7 @@ public class A11yMenuOverlayLayout { 


    public void clearLayout() {

        if (mLayout != null) {

            ViewCaptureAwareWindowManager windowManager = getViewCaptureAwareWindowManagerInstance(

                    mLayout.getContext(), com.android.systemui.Flags.enableViewCaptureTracing());

            WindowManager windowManager = WindowManagerUtils.getWindowManager(mLayout.getContext());

            if (windowManager != null) {

                windowManager.removeView(mLayout);

            }
@@ -178,7 +173,7 @@ public class A11yMenuOverlayLayout { 
            return;

        }

        updateLayoutPosition(mLayout.getContext());

        WindowManager windowManager = mLayout.getContext().getSystemService(WindowManager.class);

        WindowManager windowManager = WindowManagerUtils.getWindowManager(mLayout.getContext());

        if (windowManager != null) {

            windowManager.updateViewLayout(mLayout, mLayoutParameter);

        }