Merge "[Status Bar Refactor] 1/N: Define a singleton... (e8815327) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardViewController.java

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -20,11 +20,14 @@ import android.os.Bundle;
	import android.view.View;		import android.view.View;
	import android.view.ViewRootImpl;		import android.view.ViewRootImpl;

			import androidx.annotation.Nullable;

	import com.android.systemui.keyguard.KeyguardViewMediator;		import com.android.systemui.keyguard.KeyguardViewMediator;
	import com.android.systemui.statusbar.phone.BiometricUnlockController;		import com.android.systemui.statusbar.phone.BiometricUnlockController;
	import com.android.systemui.statusbar.phone.KeyguardBypassController;		import com.android.systemui.statusbar.phone.KeyguardBypassController;
	import com.android.systemui.statusbar.phone.NotificationPanelViewController;		import com.android.systemui.statusbar.phone.NotificationPanelViewController;
	import com.android.systemui.statusbar.phone.StatusBar;		import com.android.systemui.statusbar.phone.StatusBar;
			import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager;

	/**		/**
	* Interface to control Keyguard View. It should be implemented by KeyguardViewManagers, which		* Interface to control Keyguard View. It should be implemented by KeyguardViewManagers, which
	@@ -184,14 +187,10 @@ public interface KeyguardViewController {

	/**		/**
	* Registers the StatusBar to which this Keyguard View is mounted.		* Registers the StatusBar to which this Keyguard View is mounted.
	* @param statusBar
	* @param notificationPanelViewController
	* @param biometricUnlockController
	* @param notificationContainer
	* @param bypassController
	*/		*/
	void registerStatusBar(StatusBar statusBar,		void registerStatusBar(StatusBar statusBar,
	NotificationPanelViewController notificationPanelViewController,		NotificationPanelViewController notificationPanelViewController,
			@Nullable PanelExpansionStateManager panelExpansionStateManager,
	BiometricUnlockController biometricUnlockController,		BiometricUnlockController biometricUnlockController,
	View notificationContainer,		View notificationContainer,
	KeyguardBypassController bypassController);		KeyguardBypassController bypassController);

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+11 −2

Original line number	Original line	Diff line number	Diff line
	@@ -82,6 +82,8 @@ import android.view.WindowManagerPolicyConstants;
	import android.view.animation.Animation;		import android.view.animation.Animation;
	import android.view.animation.AnimationUtils;		import android.view.animation.AnimationUtils;

			import androidx.annotation.Nullable;

	import com.android.internal.jank.InteractionJankMonitor;		import com.android.internal.jank.InteractionJankMonitor;
	import com.android.internal.jank.InteractionJankMonitor.Configuration;		import com.android.internal.jank.InteractionJankMonitor.Configuration;
	import com.android.internal.policy.IKeyguardDismissCallback;		import com.android.internal.policy.IKeyguardDismissCallback;
	@@ -117,6 +119,7 @@ import com.android.systemui.statusbar.phone.KeyguardBypassController;
	import com.android.systemui.statusbar.phone.NotificationPanelViewController;		import com.android.systemui.statusbar.phone.NotificationPanelViewController;
	import com.android.systemui.statusbar.phone.StatusBar;		import com.android.systemui.statusbar.phone.StatusBar;
	import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController;		import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController;
			import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager;
	import com.android.systemui.statusbar.policy.KeyguardStateController;		import com.android.systemui.statusbar.policy.KeyguardStateController;
	import com.android.systemui.statusbar.policy.UserSwitcherController;		import com.android.systemui.statusbar.policy.UserSwitcherController;
	import com.android.systemui.unfold.UnfoldLightRevealOverlayAnimation;		import com.android.systemui.unfold.UnfoldLightRevealOverlayAnimation;
	@@ -2654,10 +2657,16 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
	*/		*/
	public KeyguardViewController registerStatusBar(StatusBar statusBar,		public KeyguardViewController registerStatusBar(StatusBar statusBar,
	NotificationPanelViewController panelView,		NotificationPanelViewController panelView,
			@Nullable PanelExpansionStateManager panelExpansionStateManager,
	BiometricUnlockController biometricUnlockController,		BiometricUnlockController biometricUnlockController,
	View notificationContainer, KeyguardBypassController bypassController) {		View notificationContainer, KeyguardBypassController bypassController) {
	mKeyguardViewControllerLazy.get().registerStatusBar(statusBar, panelView,		mKeyguardViewControllerLazy.get().registerStatusBar(
	biometricUnlockController, notificationContainer, bypassController);		statusBar,
			panelView,
			panelExpansionStateManager,
			biometricUnlockController,
			notificationContainer,
			bypassController);
	return mKeyguardViewControllerLazy.get();		return mKeyguardViewControllerLazy.get();
	}		}

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt

+3 −3

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -27,8 +27,8 @@ import com.android.systemui.statusbar.notification.stack.NotificationStackScroll
	import com.android.systemui.statusbar.notification.stack.StackStateAnimator		import com.android.systemui.statusbar.notification.stack.StackStateAnimator
	import com.android.systemui.statusbar.phone.DozeParameters		import com.android.systemui.statusbar.phone.DozeParameters
	import com.android.systemui.statusbar.phone.KeyguardBypassController		import com.android.systemui.statusbar.phone.KeyguardBypassController
	import com.android.systemui.statusbar.phone.PanelExpansionListener
	import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController		import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController
			import com.android.systemui.statusbar.phone.panelstate.PanelExpansionListener
	import com.android.systemui.statusbar.policy.HeadsUpManager		import com.android.systemui.statusbar.policy.HeadsUpManager
	import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener		import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener
	import javax.inject.Inject		import javax.inject.Inject
	@@ -294,8 +294,8 @@ class NotificationWakeUpCoordinator @Inject constructor(
	this.state = newState		this.state = newState
	}		}

	override fun onPanelExpansionChanged(expansion: Float, tracking: Boolean) {		override fun onPanelExpansionChanged(fraction: Float, tracking: Boolean) {
	val collapsedEnough = expansion <= 0.9f		val collapsedEnough = fraction <= 0.9f
	if (collapsedEnough != this.collapsedEnoughToHide) {		if (collapsedEnough != this.collapsedEnoughToHide) {
	val couldShowPulsingHuns = canShowPulsingHuns		val couldShowPulsingHuns = canShowPulsingHuns
	this.collapsedEnoughToHide = collapsedEnough		this.collapsedEnoughToHide = collapsedEnough

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

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -169,6 +169,7 @@ import com.android.systemui.statusbar.notification.stack.NotificationStackScroll
	import com.android.systemui.statusbar.notification.stack.StackStateAnimator;		import com.android.systemui.statusbar.notification.stack.StackStateAnimator;
	import com.android.systemui.statusbar.phone.LockscreenGestureLogger.LockscreenUiEvent;		import com.android.systemui.statusbar.phone.LockscreenGestureLogger.LockscreenUiEvent;
	import com.android.systemui.statusbar.phone.dagger.StatusBarComponent;		import com.android.systemui.statusbar.phone.dagger.StatusBarComponent;
			import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager;
	import com.android.systemui.statusbar.policy.ConfigurationController;		import com.android.systemui.statusbar.policy.ConfigurationController;
	import com.android.systemui.statusbar.policy.KeyguardQsUserSwitchController;		import com.android.systemui.statusbar.policy.KeyguardQsUserSwitchController;
	import com.android.systemui.statusbar.policy.KeyguardStateController;		import com.android.systemui.statusbar.policy.KeyguardStateController;
	@@ -686,6 +687,7 @@ public class NotificationPanelViewController extends PanelViewController {
	SplitShadeHeaderController splitShadeHeaderController,		SplitShadeHeaderController splitShadeHeaderController,
	UnlockedScreenOffAnimationController unlockedScreenOffAnimationController,		UnlockedScreenOffAnimationController unlockedScreenOffAnimationController,
	LockscreenGestureLogger lockscreenGestureLogger,		LockscreenGestureLogger lockscreenGestureLogger,
			PanelExpansionStateManager panelExpansionStateManager,
	NotificationRemoteInputManager remoteInputManager,		NotificationRemoteInputManager remoteInputManager,
	ControlsComponent controlsComponent) {		ControlsComponent controlsComponent) {
	super(view,		super(view,
	@@ -699,6 +701,7 @@ public class NotificationPanelViewController extends PanelViewController {
	flingAnimationUtilsBuilder.get(),		flingAnimationUtilsBuilder.get(),
	statusBarTouchableRegionManager,		statusBarTouchableRegionManager,
	lockscreenGestureLogger,		lockscreenGestureLogger,
			panelExpansionStateManager,
	ambientState);		ambientState);
	mView = view;		mView = view;
	mVibratorHelper = vibratorHelper;		mVibratorHelper = vibratorHelper;
	@@ -2205,10 +2208,6 @@ public class NotificationPanelViewController extends PanelViewController {
	mStatusBar.executeRunnableDismissingKeyguard(null, null /* cancelAction */,		mStatusBar.executeRunnableDismissingKeyguard(null, null /* cancelAction */,
	false /* dismissShade /, true / afterKeyguardGone /, false / deferred */);		false /* dismissShade /, true / afterKeyguardGone /, false / deferred */);
	}		}
	for (int i = 0; i < mExpansionListeners.size(); i++) {
	mExpansionListeners.get(i).onQsExpansionChanged(
	mQsMaxExpansionHeight != 0 ? mQsExpansionHeight / mQsMaxExpansionHeight : 0);
	}
	if (DEBUG) {		if (DEBUG) {
	mView.invalidate();		mView.invalidate();
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -38,8 +38,8 @@ import com.android.systemui.dump.DumpManager
	import com.android.systemui.plugins.statusbar.StatusBarStateController		import com.android.systemui.plugins.statusbar.StatusBarStateController
	import com.android.systemui.statusbar.phone.BiometricUnlockController		import com.android.systemui.statusbar.phone.BiometricUnlockController
	import com.android.systemui.statusbar.phone.DozeParameters		import com.android.systemui.statusbar.phone.DozeParameters
	import com.android.systemui.statusbar.phone.PanelExpansionListener
	import com.android.systemui.statusbar.phone.ScrimController		import com.android.systemui.statusbar.phone.ScrimController
			import com.android.systemui.statusbar.phone.panelstate.PanelExpansionListener
	import com.android.systemui.statusbar.policy.KeyguardStateController		import com.android.systemui.statusbar.policy.KeyguardStateController
	import com.android.systemui.util.WallpaperController		import com.android.systemui.util.WallpaperController
	import java.io.FileDescriptor		import java.io.FileDescriptor
	@@ -329,10 +329,10 @@ class NotificationShadeDepthController @Inject constructor(
	/**		/**
	* Update blurs when pulling down the shade		* Update blurs when pulling down the shade
	*/		*/
	override fun onPanelExpansionChanged(rawExpansion: Float, tracking: Boolean) {		override fun onPanelExpansionChanged(rawFraction: Float, tracking: Boolean) {
	val timestamp = SystemClock.elapsedRealtimeNanos()		val timestamp = SystemClock.elapsedRealtimeNanos()
	val expansion = MathUtils.saturate(		val expansion = MathUtils.saturate(
	(rawExpansion - panelPullDownMinFraction) / (1f - panelPullDownMinFraction))		(rawFraction - panelPullDownMinFraction) / (1f - panelPullDownMinFraction))

	if (shadeExpansion == expansion && prevTracking == tracking) {		if (shadeExpansion == expansion && prevTracking == tracking) {
	prevTimestamp = timestamp		prevTimestamp = timestamp