[Status Bar Refactor] Move status bar window state tracking into a (06a2da0b) · Commits · e / os / android_frameworks_base

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;
		@@ -5006,4 +5011,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/StatusBar.java

+8 −3

Original line number	Diff line number	Diff line
		@@ -232,6 +232,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;
		@@ -337,9 +338,11 @@ 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;
		// TODO(b/212424936): Have this icon manager just implement its own listener.
		mStatusBarHideIconsForBouncerManager.setStatusBarWindowHidden(mStatusBarWindowHidden);
		if (mStatusBarView != null) {
		// Should #updateHideIconsForBouncer always be called, regardless of whether we have a
		@@ -464,7 +467,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;
		@@ -692,6 +695,7 @@ public class StatusBar extends CoreStartable implements
		LightBarController lightBarController,
		AutoHideController autoHideController,
		StatusBarWindowController statusBarWindowController,
		StatusBarWindowStateController statusBarWindowStateController,
		KeyguardUpdateMonitor keyguardUpdateMonitor,
		StatusBarSignalPolicy statusBarSignalPolicy,
		PulseExpansionHandler pulseExpansionHandler,
		@@ -872,6 +876,7 @@ public class StatusBar extends CoreStartable implements
		mStartingSurfaceOptional = startingSurfaceOptional;
		mNotifPipelineFlags = notifPipelineFlags;
		lockscreenShadeTransitionController.setStatusbar(this);
		statusBarWindowStateController.addListener(this::onStatusBarWindowStateChanged);

		mScreenOffAnimationController = screenOffAnimationController;

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();

packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -105,6 +105,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.WallpaperController;
		import com.android.systemui.util.concurrency.DelayableExecutor;
		import com.android.systemui.util.concurrency.MessageRouter;
		@@ -140,6 +141,7 @@ public interface StatusBarPhoneModule {
		LightBarController lightBarController,
		AutoHideController autoHideController,
		StatusBarWindowController statusBarWindowController,
		StatusBarWindowStateController statusBarWindowStateController,
		KeyguardUpdateMonitor keyguardUpdateMonitor,
		StatusBarSignalPolicy statusBarSignalPolicy,
		PulseExpansionHandler pulseExpansionHandler,
		@@ -235,6 +237,7 @@ public interface StatusBarPhoneModule {
		lightBarController,
		autoHideController,
		statusBarWindowController,
		statusBarWindowStateController,
		keyguardUpdateMonitor,
		statusBarSignalPolicy,
		pulseExpansionHandler,

packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowStateController.kt

0 → 100644

+85 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.statusbar.window

		import android.app.StatusBarManager
		import android.app.StatusBarManager.WindowVisibleState
		import android.app.StatusBarManager.WINDOW_STATE_SHOWING
		import android.app.StatusBarManager.WINDOW_STATUS_BAR
		import android.app.StatusBarManager.windowStateToString
		import android.util.Log
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.DisplayId
		import com.android.systemui.statusbar.CommandQueue
		import com.android.systemui.statusbar.phone.StatusBar
		import javax.inject.Inject

		/**
		* A centralized class maintaining the state of the status bar window.
		*
		* Classes that want to get updates about the status bar window state should subscribe to this class
		* via [addListener] and should NOT add their own callback on [CommandQueue].
		*/
		@SysUISingleton
		class StatusBarWindowStateController @Inject constructor(
		@DisplayId private val thisDisplayId: Int,
		commandQueue: CommandQueue
		) {
		private val commandQueueCallback = object : CommandQueue.Callbacks {
		override fun setWindowState(
		displayId: Int,
		@StatusBarManager.WindowType window: Int,
		@WindowVisibleState state: Int
		) {
		this@StatusBarWindowStateController.setWindowState(displayId, window, state)
		}
		}
		private val listeners: MutableSet<StatusBarWindowStateListener> = HashSet()

		@WindowVisibleState private var windowState: Int = WINDOW_STATE_SHOWING

		init {
		commandQueue.addCallback(commandQueueCallback)
		}

		/** Adds a listener. */
		fun addListener(listener: StatusBarWindowStateListener) {
		listeners.add(listener)
		}

		private fun setWindowState(
		displayId: Int,
		@StatusBarManager.WindowType window: Int,
		@WindowVisibleState state: Int
		) {
		if (displayId != thisDisplayId) {
		return
		}
		if (window != WINDOW_STATUS_BAR) {
		return
		}
		if (windowState == state) {
		return
		}

		windowState = state
		if (StatusBar.DEBUG_WINDOW_STATE) {
		Log.d(StatusBar.TAG, "Status bar " + windowStateToString(state))
		}
		listeners.forEach { it.onStatusBarWindowStateChanged(state) }
		}
		}