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

Commit caf78260 authored by Nicolo' Mazzucato's avatar Nicolo' Mazzucato
Browse files

Use ShadeDisplayAware window manager to add the Shade view at first 

Initially, the global window manager was used, making the token re-parenting logic in child cls wrong.

Bug: 362719719
Bug: 381258683
Bug: 381217997
Test: NotificationShadeWindowControllerImplTest
Flag: com.android.systemui.shade_window_goes_around
Change-Id: I32e604ad313a9e47eef6b3a17b60507df7418ef5
parent 7b04c718

packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java

+4 −4
Original line number Diff line number Diff line
@@ -38,10 +38,10 @@ import android.view.IWindowSession; 
import android.view.View;

import android.view.ViewGroup;

import android.view.WindowInsets;

import android.view.WindowManager;

import android.view.WindowManager.LayoutParams;

import android.view.WindowManagerGlobal;



import com.android.app.viewcapture.ViewCaptureAwareWindowManager;

import com.android.internal.annotations.VisibleForTesting;

import com.android.systemui.Dumpable;

import com.android.systemui.Flags;
@@ -102,7 +102,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 


    private final Context mContext;

    private final WindowRootViewComponent.Factory mWindowRootViewComponentFactory;

    private final ViewCaptureAwareWindowManager mWindowManager;

    private final WindowManager mWindowManager;

    private final IActivityManager mActivityManager;

    private final DozeParameters mDozeParameters;

    private final KeyguardStateController mKeyguardStateController;
@@ -149,7 +149,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
    public NotificationShadeWindowControllerImpl(

            @ShadeDisplayAware Context context,

            WindowRootViewComponent.Factory windowRootViewComponentFactory,

            ViewCaptureAwareWindowManager viewCaptureAwareWindowManager,

            @ShadeDisplayAware WindowManager windowManager,

            IActivityManager activityManager,

            DozeParameters dozeParameters,

            StatusBarStateController statusBarStateController,
@@ -172,7 +172,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
            @ShadeDisplayAware LayoutParams shadeWindowLayoutParams) {

        mContext = context;

        mWindowRootViewComponentFactory = windowRootViewComponentFactory;

        mWindowManager = viewCaptureAwareWindowManager;

        mWindowManager = windowManager;

        mActivityManager = activityManager;

        mDozeParameters = dozeParameters;

        mKeyguardStateController = keyguardStateController;