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

Commit 206aa484 authored by archisha's avatar archisha Committed by Archisha Baranwal
Browse files

Use WindowManagerProvider to instantiate WindowManager. 

This class returns an appropriate WindowManager instance based on the view tracing flag.

Bug: 378798789
Flag: NONE replacing all usage of
context.getSystemService(WindowManager.class) with
ViewCaptureAwareWindowManager
Test: tested locally

Change-Id: I43f51a0b22679fa2b8afa80cd4adcc16de30c05f
parent f195cb43

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

+3 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 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.accessibility.accessibilitymenu.view.A11yMenuFooter.A11yMenuFooterCallBack;

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



import java.util.ArrayList;

import java.util.List;
@@ -292,8 +293,8 @@ public class A11yMenuViewPager { 
            // Keeps footer window height unchanged no matter the density is changed.

            mA11yMenuFooter.adjustFooterToDensityScale(densityScale);

            // Adjust the view pager height for system bar and display cutout insets.

            WindowManager windowManager = mA11yMenuLayout.getContext()

                    .getSystemService(WindowManager.class);

            WindowManager windowManager = WindowManagerUtils

                    .getWindowManager(mA11yMenuLayout.getContext());

            WindowMetrics windowMetric = windowManager.getCurrentWindowMetrics();

            Insets windowInsets = windowMetric.getWindowInsets().getInsetsIgnoringVisibility(

                    WindowInsets.Type.systemBars() | WindowInsets.Type.displayCutout());

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/floatingmenu/DragToInteractAnimationControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public class DragToInteractAnimationControllerTest extends SysuiTestCase { 
                stubWindowManager);

        final MenuView stubMenuView = spy(new MenuView(mContext, stubMenuViewModel,

                stubMenuViewAppearance, mockSecureSettings));

        mInteractView = spy(new DragToInteractView(mContext));

        mInteractView = spy(new DragToInteractView(mContext, stubWindowManager));

        mDismissView = spy(new DismissView(mContext));



        if (Flags.floatingMenuDragToEdit()) {

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/floatingmenu/MenuListViewTouchHandlerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ public class MenuListViewTouchHandlerTest extends SysuiTestCase { 
        mStubMenuView.setTranslationY(0);

        mMenuAnimationController = spy(new MenuAnimationController(

                mStubMenuView, stubMenuViewAppearance));

        mInteractView = spy(new DragToInteractView(mContext));

        mInteractView = spy(new DragToInteractView(mContext, windowManager));

        mDismissView = spy(new DismissView(mContext));



        if (Flags.floatingMenuDragToEdit()) {

packages/SystemUI/multivalentTests/src/com/android/systemui/mediaprojection/appselector/view/TaskPreviewSizeProviderTest.kt

+2 −3
Original line number Diff line number Diff line
@@ -55,8 +55,6 @@ class TaskPreviewSizeProviderTest : SysuiTestCase() { 


    @Before

    fun setup() {

        whenever(mockContext.getSystemService(eq(WindowManager::class.java)))

            .thenReturn(windowManager)

        whenever(mockContext.resources).thenReturn(resources)

    }
@@ -154,7 +152,8 @@ class TaskPreviewSizeProviderTest : SysuiTestCase() { 
        return TaskPreviewSizeProvider(

                mockContext,

                windowMetricsProvider,

                testConfigurationController

                testConfigurationController,

                windowManager

            )

            .also { it.addCallback(listener) }

    }

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java

+4 −1
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ import com.android.systemui.user.domain.interactor.UserSwitcherInteractor; 
import com.android.systemui.util.kotlin.JavaAdapter;

import com.android.systemui.util.time.FakeSystemClock;

import com.android.systemui.util.time.SystemClock;

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

import com.android.systemui.wallpapers.ui.viewmodel.WallpaperFocalAreaViewModel;

import com.android.wm.shell.animation.FlingAnimationUtils;
@@ -296,6 +297,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { 
    @Mock private LargeScreenHeaderHelper mLargeScreenHeaderHelper;

    @Mock private StatusBarLongPressGestureDetector mStatusBarLongPressGestureDetector;

    @Mock protected SysUIStateDisplaysInteractor mSysUIStateDisplaysInteractor;

    @Mock private WindowManagerProvider mWindowManagerProvider;

    protected final int mMaxUdfpsBurnInOffsetY = 5;

    protected FakeFeatureFlagsClassic mFeatureFlags = new FakeFeatureFlagsClassic();

    protected KeyguardClockInteractor mKeyguardClockInteractor;
@@ -672,7 +674,8 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { 
                mCastController,

                new ResourcesSplitShadeStateController(),

                () -> mKosmos.getCommunalTransitionViewModel(),

                () -> mLargeScreenHeaderHelper

                () -> mLargeScreenHeaderHelper,

                mWindowManagerProvider

        );

    }