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

Commit fc1416c3 authored by Caitlin Cassidy's avatar Caitlin Cassidy Committed by Android (Google) Code Review
Browse files

Merge changes from topic "ccassidy-sbwsc" 

* changes:
  [Status Bar Refactor] Have SBHideIconsForBouncerManager listen to window state directly instead of getting it from StatusBar.java
  [Status Bar Refactor] Have NotificationShadeWindowViewController query the window state directly instead of going through StatusBar.java.
  [Status Bar Refactor] Move status bar window state tracking into a centralized class and add some listeners for it.
  [Status Bar Refactor] Pass status bar view's controller to NotificationShadeWindowViewController instead of the view itself.
parents 4a06b343 d0a7f18b

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

+16 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.statusbar.phone;



import static android.app.StatusBarManager.WINDOW_STATE_SHOWING;

import static android.view.View.GONE;

import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
@@ -197,6 +198,7 @@ import com.android.systemui.statusbar.policy.KeyguardStateController; 
import com.android.systemui.statusbar.policy.KeyguardUserSwitcherController;

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

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

import com.android.systemui.statusbar.window.StatusBarWindowStateController;

import com.android.systemui.unfold.SysUIUnfoldComponent;

import com.android.systemui.util.Utils;

import com.android.systemui.util.settings.SecureSettings;
@@ -732,7 +734,9 @@ public class NotificationPanelViewController extends PanelViewController { 
            NotificationEntryManager notificationEntryManager,

            CommunalStateController communalStateController,

            KeyguardStateController keyguardStateController,

            StatusBarStateController statusBarStateController, DozeLog dozeLog,

            StatusBarStateController statusBarStateController,

            StatusBarWindowStateController statusBarWindowStateController,

            DozeLog dozeLog,

            DozeParameters dozeParameters, CommandQueue commandQueue, VibratorHelper vibratorHelper,

            LatencyTracker latencyTracker, PowerManager powerManager,

            AccessibilityManager accessibilityManager, @DisplayId int displayId,
@@ -862,6 +866,7 @@ public class NotificationPanelViewController extends PanelViewController { 
                mQs.animateHeaderSlidingOut();

            }

        });

        statusBarWindowStateController.addListener(this::onStatusBarWindowStateChanged);

        mThemeResId = mView.getContext().getThemeResId();

        mKeyguardBypassController = bypassController;

        mUpdateMonitor = keyguardUpdateMonitor;
@@ -5009,4 +5014,14 @@ public class NotificationPanelViewController extends PanelViewController { 
    public PhoneStatusBarView.TouchEventHandler getStatusBarTouchEventHandler() {

        return mStatusBarViewTouchEventHandler;

    }



    private void onStatusBarWindowStateChanged(@StatusBarManager.WindowVisibleState int state) {

        if (state != WINDOW_STATE_SHOWING

                && mStatusBarStateController.getState() == StatusBarState.SHADE) {

            collapsePanel(

                    false /* animate */,

                    false /* delayed */,

                    1.0f /* speedUpFactor */);

        }

    }

}

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

+14 −22
Original line number Diff line number Diff line
@@ -16,10 +16,7 @@ 


package com.android.systemui.statusbar.phone;



import static android.app.StatusBarManager.WINDOW_STATE_SHOWING;



import android.app.StatusBarManager;

import android.graphics.RectF;

import android.hardware.display.AmbientDisplayConfiguration;

import android.media.AudioManager;

import android.media.session.MediaSessionLegacyHelper;
@@ -47,6 +44,7 @@ import com.android.systemui.statusbar.SysuiStatusBarStateController; 
import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController;

import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager;

import com.android.systemui.statusbar.window.StatusBarWindowStateController;

import com.android.systemui.tuner.TunerService;



import java.io.FileDescriptor;
@@ -68,6 +66,7 @@ public class NotificationShadeWindowViewController { 
    private final LockscreenShadeTransitionController mLockscreenShadeTransitionController;

    private final LockIconViewController mLockIconViewController;

    private final StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;

    private final StatusBarWindowStateController mStatusBarWindowStateController;



    private GestureDetector mGestureDetector;

    private View mBrightnessMirror;
@@ -75,7 +74,7 @@ public class NotificationShadeWindowViewController { 
    private boolean mTouchCancelled;

    private boolean mExpandAnimationRunning;

    private NotificationStackScrollLayout mStackScrollLayout;

    private PhoneStatusBarView mStatusBarView;

    private PhoneStatusBarViewController mStatusBarViewController;

    private StatusBar mService;

    private NotificationShadeWindowController mNotificationShadeWindowController;

    private DragDownHelper mDragDownHelper;
@@ -86,8 +85,6 @@ public class NotificationShadeWindowViewController { 
    private final NotificationPanelViewController mNotificationPanelViewController;

    private final PanelExpansionStateManager mPanelExpansionStateManager;



    // Used for determining view / touch intersection

    private final RectF mTempRect = new RectF();

    private boolean mIsTrackingBarGesture = false;



    @Inject
@@ -103,6 +100,7 @@ public class NotificationShadeWindowViewController { 
            PanelExpansionStateManager panelExpansionStateManager,

            NotificationStackScrollLayoutController notificationStackScrollLayoutController,

            StatusBarKeyguardViewManager statusBarKeyguardViewManager,

            StatusBarWindowStateController statusBarWindowStateController,

            LockIconViewController lockIconViewController) {

        mLockscreenShadeTransitionController = transitionController;

        mFalsingCollector = falsingCollector;
@@ -115,6 +113,7 @@ public class NotificationShadeWindowViewController { 
        mDepthController = depthController;

        mNotificationStackScrollLayoutController = notificationStackScrollLayoutController;

        mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;

        mStatusBarWindowStateController = statusBarWindowStateController;

        mLockIconViewController = lockIconViewController;



        // This view is not part of the newly inflated expanded status bar.
@@ -175,7 +174,7 @@ public class NotificationShadeWindowViewController { 
        mView.setInteractionEventHandler(new NotificationShadeWindowView.InteractionEventHandler() {

            @Override

            public Boolean handleDispatchTouchEvent(MotionEvent ev) {

                if (mStatusBarView == null) {

                if (mStatusBarViewController == null) { // Fix for b/192490822

                    Log.w(TAG, "Ignoring touch while statusBarView not yet set.");

                    return false;

                }
@@ -243,27 +242,27 @@ public class NotificationShadeWindowViewController { 
                    expandingBelowNotch = true;

                }

                if (expandingBelowNotch) {

                    return mStatusBarView.dispatchTouchEvent(ev);

                    return mStatusBarViewController.sendTouchToView(ev);

                }



                if (!mIsTrackingBarGesture && isDown

                        && mNotificationPanelViewController.isFullyCollapsed()) {

                    float x = ev.getRawX();

                    float y = ev.getRawY();

                    if (isIntersecting(mStatusBarView, x, y)) {

                        if (mService.isSameStatusBarState(WINDOW_STATE_SHOWING)) {

                    if (mStatusBarViewController.touchIsWithinView(x, y)) {

                        if (mStatusBarWindowStateController.windowIsShowing()) {

                            mIsTrackingBarGesture = true;

                            return mStatusBarView.dispatchTouchEvent(ev);

                            return mStatusBarViewController.sendTouchToView(ev);

                        } else { // it's hidden or hiding, don't send to notification shade.

                            return true;

                        }

                    }

                } else if (mIsTrackingBarGesture) {

                    final boolean sendToNotification = mStatusBarView.dispatchTouchEvent(ev);

                    final boolean sendToStatusBar = mStatusBarViewController.sendTouchToView(ev);

                    if (isUp || isCancel) {

                        mIsTrackingBarGesture = false;

                    }

                    return sendToNotification;

                    return sendToStatusBar;

                }



                return null;
@@ -442,8 +441,8 @@ public class NotificationShadeWindowViewController { 
        }

    }



    public void setStatusBarView(PhoneStatusBarView statusBarView) {

        mStatusBarView = statusBarView;

    public void setStatusBarViewController(PhoneStatusBarViewController statusBarViewController) {

        mStatusBarViewController = statusBarViewController;

    }



    public void setService(StatusBar statusBar, NotificationShadeWindowController controller) {
@@ -455,11 +454,4 @@ public class NotificationShadeWindowViewController { 
    void setDragDownHelper(DragDownHelper dragDownHelper) {

        mDragDownHelper = dragDownHelper;

    }



    private boolean isIntersecting(View view, float x, float y) {

        int[] mTempLocation = view.getLocationOnScreen();

        mTempRect.set(mTempLocation[0], mTempLocation[1], mTempLocation[0] + view.getWidth(),

                mTempLocation[1] + view.getHeight());

        return mTempRect.contains(x, y);

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt

+25 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.systemui.statusbar.phone 


import android.content.res.Configuration

import android.graphics.Point

import android.view.MotionEvent

import android.view.View

import android.view.ViewGroup

import android.view.ViewTreeObserver
@@ -92,6 +93,30 @@ class PhoneStatusBarViewController private constructor( 
        mView.importantForAccessibility = mode

    }



    /**

     * Sends a touch event to the status bar view.

     *

     * This is required in certain cases because the status bar view is in a separate window from

     * the rest of SystemUI, and other windows may decide that their touch should instead be treated

     * as a status bar window touch.

     */

    fun sendTouchToView(ev: MotionEvent): Boolean {

        return mView.dispatchTouchEvent(ev)

    }



    /**

     * Returns true if the given (x, y) point (in screen coordinates) is within the status bar

     * view's range and false otherwise.

     */

    fun touchIsWithinView(x: Float, y: Float): Boolean {

        val left = mView.locationOnScreen[0]

        val top = mView.locationOnScreen[1]

        return left <= x &&

                x <= left + mView.width &&

                top <= y &&

                y <= top + mView.height

    }



    class StatusBarViewsCenterProvider : UnfoldMoveFromCenterAnimator.ViewCenterProvider {

        override fun getViewCenter(view: View, outPoint: Point) =

            when (view.id) {

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

+9 −15
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ import com.android.systemui.statusbar.policy.KeyguardStateController; 
import com.android.systemui.statusbar.policy.UserInfoControllerImpl;

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

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

import com.android.systemui.statusbar.window.StatusBarWindowStateController;

import com.android.systemui.util.DumpUtilsKt;

import com.android.systemui.util.WallpaperController;

import com.android.systemui.util.concurrency.DelayableExecutor;
@@ -338,15 +339,9 @@ public class StatusBar extends CoreStartable implements 
    private final LockscreenShadeTransitionController mLockscreenShadeTransitionController;

    private StatusBarCommandQueueCallbacks mCommandQueueCallbacks;



    void setWindowState(int state) {

    void onStatusBarWindowStateChanged(@WindowVisibleState int state) {

        updateBubblesVisibility();

        mStatusBarWindowState = state;

        mStatusBarWindowHidden = state == WINDOW_STATE_HIDDEN;

        mStatusBarHideIconsForBouncerManager.setStatusBarWindowHidden(mStatusBarWindowHidden);

        if (mStatusBarView != null) {

            // Should #updateHideIconsForBouncer always be called, regardless of whether we have a

            //   status bar view? If so, we can make #updateHideIconsForBouncer private.

            mStatusBarHideIconsForBouncerManager.updateHideIconsForBouncer(/* animate= */ false);

        }

    }



    void acquireGestureWakeLock(long time) {
@@ -465,7 +460,7 @@ public class StatusBar extends CoreStartable implements 
    private PhoneStatusBarViewController mPhoneStatusBarViewController;

    private PhoneStatusBarTransitions mStatusBarTransitions;

    private AuthRippleController mAuthRippleController;

    private int mStatusBarWindowState = WINDOW_STATE_SHOWING;

    @WindowVisibleState private int mStatusBarWindowState = WINDOW_STATE_SHOWING;

    protected NotificationShadeWindowController mNotificationShadeWindowController;

    private final StatusBarWindowController mStatusBarWindowController;

    private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;
@@ -695,6 +690,7 @@ public class StatusBar extends CoreStartable implements 
            LightBarController lightBarController,

            AutoHideController autoHideController,

            StatusBarWindowController statusBarWindowController,

            StatusBarWindowStateController statusBarWindowStateController,

            KeyguardUpdateMonitor keyguardUpdateMonitor,

            StatusBarSignalPolicy statusBarSignalPolicy,

            PulseExpansionHandler pulseExpansionHandler,
@@ -877,6 +873,7 @@ public class StatusBar extends CoreStartable implements 
        mStartingSurfaceOptional = startingSurfaceOptional;

        mNotifPipelineFlags = notifPipelineFlags;

        lockscreenShadeTransitionController.setStatusbar(this);

        statusBarWindowStateController.addListener(this::onStatusBarWindowStateChanged);



        mScreenOffAnimationController = screenOffAnimationController;
@@ -1138,7 +1135,8 @@ public class StatusBar extends CoreStartable implements 
                    mStatusBarView = statusBarView;

                    mPhoneStatusBarViewController = statusBarViewController;

                    mStatusBarTransitions = statusBarTransitions;

                    mNotificationShadeWindowViewController.setStatusBarView(mStatusBarView);

                    mNotificationShadeWindowViewController

                            .setStatusBarViewController(mPhoneStatusBarViewController);

                    // Ensure we re-propagate panel expansion values to the panel controller and

                    // any listeners it may have, such as PanelBar. This will also ensure we

                    // re-display the notification panel if necessary (for example, if
@@ -2111,10 +2109,6 @@ public class StatusBar extends CoreStartable implements 
        }

    }



    boolean isSameStatusBarState(int state) {

        return mStatusBarWindowState == state;

    }



    public GestureRecorder getGestureRecorder() {

        return mGestureRec;

    }

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

+0 −27
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.systemui.statusbar.phone;



import static android.app.StatusBarManager.WINDOW_STATE_SHOWING;

import static android.app.StatusBarManager.windowStateToString;

import static android.view.InsetsState.ITYPE_STATUS_BAR;

import static android.view.InsetsState.containsType;
@@ -58,7 +56,6 @@ import com.android.systemui.keyguard.WakefulnessLifecycle; 
import com.android.systemui.qs.QSPanelController;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.DisableFlagsLogger;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController;
@@ -514,30 +511,6 @@ public class StatusBarCommandQueueCallbacks implements CommandQueue.Callbacks { 
                .setTopAppHidesStatusBarAndTriggerUpdate(topAppHidesStatusBar);

    }



    @Override

    public void setWindowState(

            int displayId, @StatusBarManager.WindowType int window,

            @StatusBarManager.WindowVisibleState int state) {

        if (displayId != mDisplayId) {

            return;

        }

        boolean showing = state == WINDOW_STATE_SHOWING;

        if (mNotificationShadeWindowView != null

                && window == StatusBarManager.WINDOW_STATUS_BAR

                && !mStatusBar.isSameStatusBarState(state)) {

            mStatusBar.setWindowState(state);

            if (StatusBar.DEBUG_WINDOW_STATE) {

                Log.d(StatusBar.TAG, "Status bar " + windowStateToString(state));

            }

            if (!showing && mStatusBarStateController.getState() == StatusBarState.SHADE) {

                mNotificationPanelViewController.collapsePanel(

                            false /* animate */, false /* delayed */, 1.0f /* speedUpFactor */);

            }

        }



        mStatusBar.updateBubblesVisibility();

    }



    @Override

    public void showAssistDisclosure() {

        mAssistManager.showDisclosure();