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

Commit 2252bed2 authored by d34d's avatar d34d Committed by Clark Scheff
Browse files

ExpandedDesktop: Use WindowManagerPolicyControl 

A PolicyControl static methods were still being used, this patch
makes sure we are using WindowManagerPolicyControl instead.

Change-Id: Iac9dac8e356f2948506ded9bf959e86608083744
parent 3ada4b5a

services/core/java/com/android/server/policy/PhoneWindowManager.java

+3 −3
Original line number Diff line number Diff line
@@ -122,9 +122,9 @@ import android.view.accessibility.AccessibilityManager; 
import android.view.animation.Animation;

import android.view.animation.AnimationSet;

import android.view.animation.AnimationUtils;

import android.view.WindowManagerPolicyControl;

import android.widget.Toast;



import android.view.WindowManagerPolicyControl;

import com.android.internal.R;

import com.android.internal.policy.IKeyguardService;

import com.android.internal.statusbar.IStatusBarService;
@@ -1155,7 +1155,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        // taken over the whole screen.

        boolean panic = mImmersiveModeConfirmation.onPowerKeyDown(interactive,

                SystemClock.elapsedRealtime(), isImmersiveMode(mLastSystemUiFlags));

        if (panic && !PolicyControl.isImmersiveFiltersActive()) {

        if (panic && !WindowManagerPolicyControl.isImmersiveFiltersActive()) {

            mHandler.post(mHiddenNavPanic);

        }
@@ -7530,7 +7530,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                // If the top fullscreen-or-dimming window is also the top fullscreen, respect

                // its light flag.

                vis &= ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;

                vis |= PolicyControl.getSystemUiVisibility(statusColorWin, null)

                vis |= WindowManagerPolicyControl.getSystemUiVisibility(statusColorWin, null)

                        & View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;

            } else if (statusColorWin != null && statusColorWin.isDimming()) {

                // Otherwise if it's dimming, clear the light flag.