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

Commit 9c438cd7 authored by Archisha Baranwal's avatar Archisha Baranwal
Browse files

Revert "Reverting usage of WindowManagerUtils in A11yMenuOverlayLayout to fix" 

This reverts commit 6b8c31a3.

Bug: 407666525

Test: Flashed device and verfied the Accessibility menu opens as
expected.

Reason for revert: Fix added in b/406318166 will fix the issue reported here as well, hence reverting the cl.

Change-Id: I79c2493532e25612b8b227f0bf5c812e4ee32535
parent f24b2e90

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

+4 −4
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import com.android.systemui.accessibility.accessibilitymenu.AccessibilityMenuSer 
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;
@@ -143,7 +144,7 @@ public class A11yMenuOverlayLayout { 
        final Context uiContext = mService.createWindowContext(

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

        uiContext.setTheme(R.style.ServiceTheme);

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

        final WindowManager windowManager = WindowManagerUtils.getWindowManager(uiContext);

        mLayout = new A11yMenuFrameLayout(uiContext);

        updateLayoutPosition(uiContext);

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


    public void clearLayout() {

        if (mLayout != null) {

            WindowManager windowManager =

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

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

            if (windowManager != null) {

                windowManager.removeView(mLayout);

            }
@@ -174,7 +174,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);

        }