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

Commit c892e59d authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge changes Ib6e4bbd4,I22f9b929 

* changes:
  Hide system overlays on AOD
  Rename StatusBarWindowManager to  StatusBarWindowController
parents 9c12bd84 a3e36273

packages/SystemUI/src/com/android/systemui/Dependency.java

+3 −3
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ import com.android.systemui.statusbar.phone.ManagedProfileController; 
import com.android.systemui.statusbar.phone.ManagedProfileControllerImpl;

import com.android.systemui.statusbar.phone.StatusBarIconController;

import com.android.systemui.statusbar.phone.StatusBarIconControllerImpl;

import com.android.systemui.statusbar.phone.StatusBarWindowManager;

import com.android.systemui.statusbar.phone.StatusBarWindowController;

import com.android.systemui.statusbar.policy.AccessibilityController;

import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper;

import com.android.systemui.statusbar.policy.BatteryController;
@@ -258,8 +258,8 @@ public class Dependency extends SystemUI { 
        mProviders.put(TunerService.class, () ->

                new TunerServiceImpl(mContext));



        mProviders.put(StatusBarWindowManager.class, () ->

                new StatusBarWindowManager(mContext));

        mProviders.put(StatusBarWindowController.class, () ->

                new StatusBarWindowController(mContext));



        mProviders.put(DarkIconDispatcher.class, () ->

                new DarkIconDispatcherImpl(mContext));

packages/SystemUI/src/com/android/systemui/SystemUIApplication.java

+4 −4
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import com.android.systemui.plugins.OverlayPlugin; 
import com.android.systemui.plugins.PluginListener;

import com.android.systemui.plugins.PluginManager;

import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.statusbar.phone.StatusBarWindowManager;

import com.android.systemui.statusbar.phone.StatusBarWindowController;

import com.android.systemui.util.NotificationChannels;



import java.util.HashMap;
@@ -210,9 +210,9 @@ public class SystemUIApplication extends Application implements SysUiServiceProv 
                        if (mOverlays == null) mOverlays = new ArraySet<>();

                        if (plugin.holdStatusBarOpen()) {

                            mOverlays.add(plugin);

                            Dependency.get(StatusBarWindowManager.class).setStateListener(b ->

                            Dependency.get(StatusBarWindowController.class).setStateListener(b ->

                                    mOverlays.forEach(o -> o.setCollapseDesired(b)));

                            Dependency.get(StatusBarWindowManager.class).setForcePluginOpen(

                            Dependency.get(StatusBarWindowController.class).setForcePluginOpen(

                                    mOverlays.size() != 0);



                        }
@@ -221,7 +221,7 @@ public class SystemUIApplication extends Application implements SysUiServiceProv 
                    @Override

                    public void onPluginDisconnected(OverlayPlugin plugin) {

                        mOverlays.remove(plugin);

                        Dependency.get(StatusBarWindowManager.class).setForcePluginOpen(

                        Dependency.get(StatusBarWindowController.class).setForcePluginOpen(

                                mOverlays.size() != 0);

                    }

                }, OverlayPlugin.class, true /* Allow multiple plugins */);

packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java

+6 −6
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback { 
    private KeyguardUpdateMonitor mUpdateMonitor;

    private int mMode;

    private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;

    private StatusBarWindowManager mStatusBarWindowManager;

    private StatusBarWindowController mStatusBarWindowController;

    private DozeScrimController mDozeScrimController;

    private KeyguardViewMediator mKeyguardViewMediator;

    private ScrimController mScrimController;
@@ -125,7 +125,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback { 
        mUpdateMonitor.registerCallback(this);

        Dependency.get(WakefulnessLifecycle.class).addObserver(mWakefulnessObserver);

        Dependency.get(ScreenLifecycle.class).addObserver(mScreenObserver);

        mStatusBarWindowManager = Dependency.get(StatusBarWindowManager.class);

        mStatusBarWindowController = Dependency.get(StatusBarWindowController.class);

        mDozeScrimController = dozeScrimController;

        mKeyguardViewMediator = keyguardViewMediator;

        mScrimController = scrimController;
@@ -214,7 +214,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback { 
            // notifications would light up first, creating an unpleasant animation.

            // Defer changing the screen brightness by forcing doze brightness on our window

            // until the clock and the notifications are faded out.

            mStatusBarWindowManager.setForceDozeBrightness(true);

            mStatusBarWindowController.setForceDozeBrightness(true);

        }

        // During wake and unlock, we need to draw black before waking up to avoid abrupt

        // brightness changes due to display state transitions.
@@ -269,7 +269,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback { 
                    Trace.beginSection("MODE_WAKE_AND_UNLOCK_FROM_DREAM");

                    mUpdateMonitor.awakenFromDream();

                }

                mStatusBarWindowManager.setStatusBarFocusable(false);

                mStatusBarWindowController.setStatusBarFocusable(false);

                if (delayWakeUp) {

                    mHandler.postDelayed(wakeUp, 50);

                } else {
@@ -384,7 +384,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback { 
        mHandler.postDelayed(new Runnable() {

            @Override

            public void run() {

                mStatusBarWindowManager.setForceDozeBrightness(false);

                mStatusBarWindowController.setForceDozeBrightness(false);

            }

        }, StatusBar.FADE_KEYGUARD_DURATION_PULSING);

    }
@@ -395,7 +395,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback { 


    private void resetMode() {

        mMode = MODE_NONE;

        mStatusBarWindowManager.setForceDozeBrightness(false);

        mStatusBarWindowController.setForceDozeBrightness(false);

        if (mStatusBar.getNavigationBarView() != null) {

            mStatusBar.getNavigationBarView().setWakeAndUnlocking(false);

        }

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+30 −30
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
    protected StatusBarWindowView mStatusBarWindow;

    protected PhoneStatusBarView mStatusBarView;

    private int mStatusBarWindowState = WINDOW_STATE_SHOWING;

    protected StatusBarWindowManager mStatusBarWindowManager;

    protected StatusBarWindowController mStatusBarWindowController;

    protected UnlockMethodCache mUnlockMethodCache;

    private DozeServiceHost mDozeServiceHost = new DozeServiceHost();

    private boolean mWakeUpComingFromTouch;
@@ -515,7 +515,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
            final boolean supportsAmbientMode = info != null &&

                    info.supportsAmbientMode();



            mStatusBarWindowManager.setWallpaperSupportsAmbientMode(supportsAmbientMode);

            mStatusBarWindowController.setWallpaperSupportsAmbientMode(supportsAmbientMode);

            mScrimController.setWallpaperSupportsAmbientMode(supportsAmbientMode);

        }

    };
@@ -957,8 +957,8 @@ public class StatusBar extends SystemUI implements DemoMode, 
                scrimBehind, scrimInFront, mLockscreenWallpaper,

                (state, alpha, color) -> mLightBarController.setScrimState(state, alpha, color),

                scrimsVisible -> {

                    if (mStatusBarWindowManager != null) {

                        mStatusBarWindowManager.setScrimsVisibility(scrimsVisible);

                    if (mStatusBarWindowController != null) {

                        mStatusBarWindowController.setScrimsVisibility(scrimsVisible);

                    }

                }, DozeParameters.getInstance(mContext),

                mContext.getSystemService(AlarmManager.class));
@@ -1702,7 +1702,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
                    mBackdrop.animate().cancel();

                    mBackdrop.setAlpha(1f);

                }

                mStatusBarWindowManager.setBackdropShowing(true);

                mStatusBarWindowController.setBackdropShowing(true);

                metaDataChanged = true;

                if (DEBUG_MEDIA) {

                    Log.v(TAG, "DEBUG_MEDIA: Fading in album artwork");
@@ -1762,9 +1762,9 @@ public class StatusBar extends SystemUI implements DemoMode, 
                    // We are unlocking directly - no animation!

                    mBackdrop.setVisibility(View.GONE);

                    mBackdropBack.setImageDrawable(null);

                    mStatusBarWindowManager.setBackdropShowing(false);

                    mStatusBarWindowController.setBackdropShowing(false);

                } else {

                    mStatusBarWindowManager.setBackdropShowing(false);

                    mStatusBarWindowController.setBackdropShowing(false);

                    mBackdrop.animate()

                            .alpha(SRC_MIN_ALPHA)

                            .setInterpolator(Interpolators.ACCELERATE_DECELERATE)
@@ -1918,7 +1918,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
    }



    public void setQsExpanded(boolean expanded) {

        mStatusBarWindowManager.setQsExpanded(expanded);

        mStatusBarWindowController.setQsExpanded(expanded);

        mNotificationPanel.setStatusAccessibilityImportance(expanded

                ? View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS

                : View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);
@@ -2001,31 +2001,31 @@ public class StatusBar extends SystemUI implements DemoMode, 
    @Override

    public void onHeadsUpPinnedModeChanged(boolean inPinnedMode) {

        if (inPinnedMode) {

            mStatusBarWindowManager.setHeadsUpShowing(true);

            mStatusBarWindowManager.setForceStatusBarVisible(true);

            mStatusBarWindowController.setHeadsUpShowing(true);

            mStatusBarWindowController.setForceStatusBarVisible(true);

            if (mNotificationPanel.isFullyCollapsed()) {

                // We need to ensure that the touchable region is updated before the window will be

                // resized, in order to not catch any touches. A layout will ensure that

                // onComputeInternalInsets will be called and after that we can resize the layout. Let's

                // make sure that the window stays small for one frame until the touchableRegion is set.

                mNotificationPanel.requestLayout();

                mStatusBarWindowManager.setForceWindowCollapsed(true);

                mStatusBarWindowController.setForceWindowCollapsed(true);

                mNotificationPanel.post(() -> {

                    mStatusBarWindowManager.setForceWindowCollapsed(false);

                    mStatusBarWindowController.setForceWindowCollapsed(false);

                });

            }

        } else {

            if (!mNotificationPanel.isFullyCollapsed() || mNotificationPanel.isTracking()) {

                // We are currently tracking or is open and the shade doesn't need to be kept

                // open artificially.

                mStatusBarWindowManager.setHeadsUpShowing(false);

                mStatusBarWindowController.setHeadsUpShowing(false);

            } else {

                // we need to keep the panel open artificially, let's wait until the animation

                // is finished.

                mHeadsUpManager.setHeadsUpGoingAway(true);

                mStackScroller.runAfterAnimationFinished(() -> {

                    if (!mHeadsUpManager.hasPinnedHeadsUp()) {

                        mStatusBarWindowManager.setHeadsUpShowing(false);

                        mStatusBarWindowController.setHeadsUpShowing(false);

                        mHeadsUpManager.setHeadsUpGoingAway(false);

                    }

                    mRemoteInputManager.removeRemoteInputEntriesKeptUntilCollapsed();
@@ -2065,7 +2065,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
    public void setPanelExpanded(boolean isExpanded) {

        mPanelExpanded = isExpanded;

        updateHideIconsForBouncer(false /* animate */);

        mStatusBarWindowManager.setPanelExpanded(isExpanded);

        mStatusBarWindowController.setPanelExpanded(isExpanded);

        mVisualStabilityManager.setPanelExpanded(isExpanded);

        if (isExpanded && getBarState() != StatusBarState.KEYGUARD) {

            if (DEBUG) {
@@ -2274,7 +2274,7 @@ public class StatusBar extends SystemUI implements DemoMode, 


        // Expand the window to encompass the full screen in anticipation of the drag.

        // This is only possible to do atomically because the status bar is at the top of the screen!

        mStatusBarWindowManager.setPanelVisible(true);

        mStatusBarWindowController.setPanelVisible(true);



        visibilityChanged(true);

        recomputeDisableFlags(!force /* animate */);
@@ -2348,7 +2348,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
                + mNotificationPanel.canPanelBeCollapsed());

        if (mStatusBarWindow != null && mNotificationPanel.canPanelBeCollapsed()) {

            // release focus immediately to kick off focus change transition

            mStatusBarWindowManager.setStatusBarFocusable(false);

            mStatusBarWindowController.setStatusBarFocusable(false);



            mStatusBarWindow.cancelExpandHelper();

            mStatusBarView.collapsePanel(true /* animate */, delayed, speedUpFactor);
@@ -2420,8 +2420,8 @@ public class StatusBar extends SystemUI implements DemoMode, 
        visibilityChanged(false);



        // Shrink the window to the size of the status bar only

        mStatusBarWindowManager.setPanelVisible(false);

        mStatusBarWindowManager.setForceStatusBarVisible(false);

        mStatusBarWindowController.setPanelVisible(false);

        mStatusBarWindowController.setForceStatusBarVisible(false);



        // Close any guts that might be visible

        mGutsManager.closeAndSaveGuts(true /* removeLeavebehind */, true /* force */,
@@ -2894,7 +2894,7 @@ public class StatusBar extends SystemUI implements DemoMode, 


    private void addStatusBarWindow() {

        makeStatusBarView();

        mStatusBarWindowManager = Dependency.get(StatusBarWindowManager.class);

        mStatusBarWindowController = Dependency.get(StatusBarWindowController.class);

        mRemoteInputManager.setUpWithPresenter(this, mEntryManager, this,

                new RemoteInputController.Delegate() {

                    public void setRemoteInputActive(NotificationData.Entry entry,
@@ -2911,8 +2911,8 @@ public class StatusBar extends SystemUI implements DemoMode, 
                        mStackScroller.requestDisallowDismiss();

                    }

                });

        mRemoteInputManager.getController().addCallback(mStatusBarWindowManager);

        mStatusBarWindowManager.add(mStatusBarWindow, getStatusBarHeight());

        mRemoteInputManager.getController().addCallback(mStatusBarWindowController);

        mStatusBarWindowController.add(mStatusBarWindow, getStatusBarHeight());

    }



    // called by makeStatusbar and also by PhoneStatusBarView
@@ -3222,8 +3222,8 @@ public class StatusBar extends SystemUI implements DemoMode, 
        int oldBarHeight = mNaturalBarHeight;

        mNaturalBarHeight = res.getDimensionPixelSize(

                com.android.internal.R.dimen.status_bar_height);

        if (mStatusBarWindowManager != null && mNaturalBarHeight != oldBarHeight) {

            mStatusBarWindowManager.setBarHeight(mNaturalBarHeight);

        if (mStatusBarWindowController != null && mNaturalBarHeight != oldBarHeight) {

            mStatusBarWindowController.setBarHeight(mNaturalBarHeight);

        }

        mMaxAllowedKeyguardNotifications = res.getInteger(

                R.integer.keyguard_max_notification_count);
@@ -3881,7 +3881,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
     * Switches theme from light to dark and vice-versa.

     */

    protected void updateTheme() {

        final boolean inflated = mStackScroller != null && mStatusBarWindowManager != null;

        final boolean inflated = mStackScroller != null && mStatusBarWindowController != null;



        // Lock wallpaper defines the color of the majority of the views, hence we'll use it

        // to set our default theme.
@@ -3907,7 +3907,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
            mStackScroller.updateDecorViews(useDarkText);



            // Make sure we have the correct navbar/statusbar colors.

            mStatusBarWindowManager.setKeyguardDark(useDarkText);

            mStatusBarWindowController.setKeyguardDark(useDarkText);

        }

    }
@@ -4071,7 +4071,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
        mGroupManager.setStatusBarState(state);

        mHeadsUpManager.setStatusBarState(state);

        mFalsingManager.setStatusBarState(state);

        mStatusBarWindowManager.setStatusBarState(state);

        mStatusBarWindowController.setStatusBarState(state);

        mStackScroller.setStatusBarState(state);

        updateReportRejectedTouchVisibility();

        updateDozing();
@@ -4101,7 +4101,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
        if (!isPresenterFullyCollapsed()) {

            // if we set it not to be focusable when collapsing, we have to undo it when we aborted

            // the closing

            mStatusBarWindowManager.setStatusBarFocusable(true);

            mStatusBarWindowController.setStatusBarFocusable(true);

        }

    }
@@ -4718,7 +4718,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
        if (mDozing != dozing) {

            mDozing = dozing;

            mKeyguardViewMediator.setAodShowing(mDozing);

            mStatusBarWindowManager.setDozing(mDozing);

            mStatusBarWindowController.setDozing(mDozing);

            mStatusBarKeyguardViewManager.setDozing(mDozing);

            if (mAmbientIndicationContainer instanceof DozeReceiver) {

                ((DozeReceiver) mAmbientIndicationContainer).setDozing(mDozing);
@@ -4948,7 +4948,7 @@ public class StatusBar extends SystemUI implements DemoMode, 


        @Override

        public void setDozeScreenBrightness(int value) {

            mStatusBarWindowManager.setDozeScreenBrightness(value);

            mStatusBarWindowController.setDozeScreenBrightness(value);

        }



        @Override

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+14 −14
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
    private static String TAG = "StatusBarKeyguardViewManager";



    protected final Context mContext;

    private final StatusBarWindowManager mStatusBarWindowManager;

    private final StatusBarWindowController mStatusBarWindowController;

    private final BouncerExpansionCallback mExpansionCallback = new BouncerExpansionCallback() {

        @Override

        public void onFullyShown() {
@@ -135,7 +135,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        mContext = context;

        mViewMediatorCallback = callback;

        mLockPatternUtils = lockPatternUtils;

        mStatusBarWindowManager = Dependency.get(StatusBarWindowManager.class);

        mStatusBarWindowController = Dependency.get(StatusBarWindowController.class);

        KeyguardUpdateMonitor.getInstance(context).registerCallback(mUpdateMonitorCallback);

    }
@@ -190,7 +190,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
     */

    public void show(Bundle options) {

        mShowing = true;

        mStatusBarWindowManager.setKeyguardShowing(true);

        mStatusBarWindowController.setKeyguardShowing(true);

        reset(true /* hideBouncerWhenShowing */);

        StatsLog.write(StatsLog.KEYGUARD_STATE_CHANGED,

            StatsLog.KEYGUARD_STATE_CHANGED__STATE__SHOWN);
@@ -342,11 +342,11 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
    }



    public void setNeedsInput(boolean needsInput) {

        mStatusBarWindowManager.setKeyguardNeedsInput(needsInput);

        mStatusBarWindowController.setKeyguardNeedsInput(needsInput);

    }



    public boolean isUnlockWithWallpaper() {

        return mStatusBarWindowManager.isShowingWallpaper();

        return mStatusBarWindowController.isShowingWallpaper();

    }



    public void setOccluded(boolean occluded, boolean animate) {
@@ -360,7 +360,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
                        new Runnable() {

                            @Override

                            public void run() {

                                mStatusBarWindowManager.setKeyguardOccluded(mOccluded);

                                mStatusBarWindowController.setKeyguardOccluded(mOccluded);

                                reset(true /* hideBouncerWhenShowing */);

                            }

                        });
@@ -375,7 +375,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        if (mShowing) {

            mStatusBar.updateMediaMetaData(false, animate && !occluded);

        }

        mStatusBarWindowManager.setKeyguardOccluded(occluded);

        mStatusBarWindowController.setKeyguardOccluded(occluded);



        // setDozing(false) will call reset once we stop dozing.

        if (!mDozing) {
@@ -425,8 +425,8 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
            mStatusBar.fadeKeyguardAfterLaunchTransition(new Runnable() {

                @Override

                public void run() {

                    mStatusBarWindowManager.setKeyguardShowing(false);

                    mStatusBarWindowManager.setKeyguardFadingAway(true);

                    mStatusBarWindowController.setKeyguardShowing(false);

                    mStatusBarWindowController.setKeyguardFadingAway(true);

                    hideBouncer(true /* destroyView */);

                    updateStates();

                }
@@ -434,7 +434,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
                @Override

                public void run() {

                    mStatusBar.hideKeyguard();

                    mStatusBarWindowManager.setKeyguardFadingAway(false);

                    mStatusBarWindowController.setKeyguardFadingAway(false);

                    mViewMediatorCallback.keyguardGone();

                    executeAfterKeyguardGoneAction();

                }
@@ -456,7 +456,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
            } else {

                boolean staying = mStatusBar.hideKeyguard();

                if (!staying) {

                    mStatusBarWindowManager.setKeyguardFadingAway(true);

                    mStatusBarWindowController.setKeyguardFadingAway(true);

                    wakeAndUnlockDejank();

                } else {

                    mStatusBar.finishKeyguardFadingAway();
@@ -464,7 +464,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
                }

            }

            updateStates();

            mStatusBarWindowManager.setKeyguardShowing(false);

            mStatusBarWindowController.setKeyguardShowing(false);

            mViewMediatorCallback.keyguardGone();

        }

        StatsLog.write(StatsLog.KEYGUARD_STATE_CHANGED,
@@ -481,7 +481,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
    }



    public void onKeyguardFadedAway() {

        mContainer.postDelayed(() -> mStatusBarWindowManager.setKeyguardFadingAway(false),

        mContainer.postDelayed(() -> mStatusBarWindowController.setKeyguardFadingAway(false),

                100);

        mStatusBar.finishKeyguardFadingAway();

        mBiometricUnlockController.finishKeyguardFadingAway();
@@ -599,7 +599,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        }



        if (bouncerShowing != mLastBouncerShowing || mFirstUpdate) {

            mStatusBarWindowManager.setBouncerShowing(bouncerShowing);

            mStatusBarWindowController.setBouncerShowing(bouncerShowing);

            mStatusBar.setBouncerShowing(bouncerShowing);

        }