Merge "Moved panel expansion classes to shade package" (fc48388a) · Commits · e / os / android_frameworks_base

packages/SystemUI/ktfmt_includes.txt

+2 −2

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

+2 −2

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationViewController.kt

+6 −6

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsBpViewController.kt

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -17,8 +17,8 @@ package com.android.systemui.biometrics

	import com.android.systemui.dump.DumpManager		import com.android.systemui.dump.DumpManager
	import com.android.systemui.plugins.statusbar.StatusBarStateController		import com.android.systemui.plugins.statusbar.StatusBarStateController
			import com.android.systemui.shade.ShadeExpansionStateManager
	import com.android.systemui.statusbar.phone.SystemUIDialogManager		import com.android.systemui.statusbar.phone.SystemUIDialogManager
	import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager

	/**		/**
	* Class that coordinates non-HBM animations for biometric prompt.		* Class that coordinates non-HBM animations for biometric prompt.
	@@ -26,13 +26,13 @@ import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManage
	class UdfpsBpViewController(		class UdfpsBpViewController(
	view: UdfpsBpView,		view: UdfpsBpView,
	statusBarStateController: StatusBarStateController,		statusBarStateController: StatusBarStateController,
	panelExpansionStateManager: PanelExpansionStateManager,		shadeExpansionStateManager: ShadeExpansionStateManager,
	systemUIDialogManager: SystemUIDialogManager,		systemUIDialogManager: SystemUIDialogManager,
	dumpManager: DumpManager		dumpManager: DumpManager
	) : UdfpsAnimationViewController<UdfpsBpView>(		) : UdfpsAnimationViewController<UdfpsBpView>(
	view,		view,
	statusBarStateController,		statusBarStateController,
	panelExpansionStateManager,		shadeExpansionStateManager,
	systemUIDialogManager,		systemUIDialogManager,
	dumpManager		dumpManager
	) {		) {

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -493,7 +493,7 @@
	-packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallFlags.kt		-packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallFlags.kt
	-packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallLogger.kt		-packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallLogger.kt
	-packages/SystemUI/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionStateManager.kt		-packages/SystemUI/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionStateManager.kt
	-packages/SystemUI/src/com/android/systemui/statusbar/phone/panelstate/PanelStateListener.kt		-packages/SystemUI/src/com/android/systemui/statusbar/phone/panelstate/ShadeStateListener.kt
	-packages/SystemUI/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserInfoTracker.kt		-packages/SystemUI/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserInfoTracker.kt
	-packages/SystemUI/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherContainer.kt		-packages/SystemUI/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherContainer.kt
	-packages/SystemUI/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherController.kt		-packages/SystemUI/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherController.kt
	@@ -812,7 +812,7 @@
	-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallChronometerTest.kt		-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallChronometerTest.kt
	-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerTest.kt		-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerTest.kt
	-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallLoggerTest.kt		-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallLoggerTest.kt
	-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionStateManagerTest.kt		-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/panelstate/ShadeExpansionStateManagerTest.kt
	-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherControllerOldImplTest.kt		-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherControllerOldImplTest.kt
	-packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityPipelineLoggerTest.kt		-packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityPipelineLoggerTest.kt
	-packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepositoryImplTest.kt		-packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepositoryImplTest.kt

Original line number	Original line	Diff line number	Diff line
	@@ -24,10 +24,10 @@ import androidx.annotation.Nullable;

	import com.android.systemui.keyguard.KeyguardViewMediator;		import com.android.systemui.keyguard.KeyguardViewMediator;
	import com.android.systemui.shade.NotificationPanelViewController;		import com.android.systemui.shade.NotificationPanelViewController;
			import com.android.systemui.shade.ShadeExpansionStateManager;
	import com.android.systemui.statusbar.phone.BiometricUnlockController;		import com.android.systemui.statusbar.phone.BiometricUnlockController;
	import com.android.systemui.statusbar.phone.CentralSurfaces;		import com.android.systemui.statusbar.phone.CentralSurfaces;
	import com.android.systemui.statusbar.phone.KeyguardBypassController;		import com.android.systemui.statusbar.phone.KeyguardBypassController;
	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
	@@ -185,7 +185,7 @@ public interface KeyguardViewController {
	*/		*/
	void registerCentralSurfaces(CentralSurfaces centralSurfaces,		void registerCentralSurfaces(CentralSurfaces centralSurfaces,
	NotificationPanelViewController notificationPanelViewController,		NotificationPanelViewController notificationPanelViewController,
	@Nullable PanelExpansionStateManager panelExpansionStateManager,		@Nullable ShadeExpansionStateManager shadeExpansionStateManager,
	BiometricUnlockController biometricUnlockController,		BiometricUnlockController biometricUnlockController,
	View notificationContainer,		View notificationContainer,
	KeyguardBypassController bypassController);		KeyguardBypassController bypassController);

Original line number	Original line	Diff line number	Diff line
	@@ -22,9 +22,9 @@ import com.android.systemui.Dumpable
	import com.android.systemui.animation.Interpolators		import com.android.systemui.animation.Interpolators
	import com.android.systemui.dump.DumpManager		import com.android.systemui.dump.DumpManager
	import com.android.systemui.plugins.statusbar.StatusBarStateController		import com.android.systemui.plugins.statusbar.StatusBarStateController
			import com.android.systemui.shade.ShadeExpansionListener
			import com.android.systemui.shade.ShadeExpansionStateManager
	import com.android.systemui.statusbar.phone.SystemUIDialogManager		import com.android.systemui.statusbar.phone.SystemUIDialogManager
	import com.android.systemui.statusbar.phone.panelstate.PanelExpansionListener
	import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager
	import com.android.systemui.util.ViewController		import com.android.systemui.util.ViewController
	import java.io.PrintWriter		import java.io.PrintWriter

	@@ -41,7 +41,7 @@ import java.io.PrintWriter
	abstract class UdfpsAnimationViewController<T : UdfpsAnimationView>(		abstract class UdfpsAnimationViewController<T : UdfpsAnimationView>(
	view: T,		view: T,
	protected val statusBarStateController: StatusBarStateController,		protected val statusBarStateController: StatusBarStateController,
	protected val panelExpansionStateManager: PanelExpansionStateManager,		protected val shadeExpansionStateManager: ShadeExpansionStateManager,
	protected val dialogManager: SystemUIDialogManager,		protected val dialogManager: SystemUIDialogManager,
	private val dumpManager: DumpManager		private val dumpManager: DumpManager
	) : ViewController<T>(view), Dumpable {		) : ViewController<T>(view), Dumpable {
	@@ -54,7 +54,7 @@ abstract class UdfpsAnimationViewController<T : UdfpsAnimationView>(
	private var dialogAlphaAnimator: ValueAnimator? = null		private var dialogAlphaAnimator: ValueAnimator? = null
	private val dialogListener = SystemUIDialogManager.Listener { runDialogAlphaAnimator() }		private val dialogListener = SystemUIDialogManager.Listener { runDialogAlphaAnimator() }

	private val panelExpansionListener = PanelExpansionListener { event ->		private val shadeExpansionListener = ShadeExpansionListener { event ->
	// Notification shade can be expanded but not visible (fraction: 0.0), for example		// Notification shade can be expanded but not visible (fraction: 0.0), for example
	// when a heads-up notification (HUN) is showing.		// when a heads-up notification (HUN) is showing.
	notificationShadeVisible = event.expanded && event.fraction > 0f		notificationShadeVisible = event.expanded && event.fraction > 0f
	@@ -108,13 +108,13 @@ abstract class UdfpsAnimationViewController<T : UdfpsAnimationView>(
	}		}

	override fun onViewAttached() {		override fun onViewAttached() {
	panelExpansionStateManager.addExpansionListener(panelExpansionListener)		shadeExpansionStateManager.addExpansionListener(shadeExpansionListener)
	dialogManager.registerListener(dialogListener)		dialogManager.registerListener(dialogListener)
	dumpManager.registerDumpable(dumpTag, this)		dumpManager.registerDumpable(dumpTag, this)
	}		}

	override fun onViewDetached() {		override fun onViewDetached() {
	panelExpansionStateManager.removeExpansionListener(panelExpansionListener)		shadeExpansionStateManager.removeExpansionListener(shadeExpansionListener)
	dialogManager.unregisterListener(dialogListener)		dialogManager.unregisterListener(dialogListener)

Original line number	Original line	Diff line number	Diff line
	@@ -63,12 +63,12 @@ import com.android.systemui.dump.DumpManager;
	import com.android.systemui.keyguard.ScreenLifecycle;		import com.android.systemui.keyguard.ScreenLifecycle;
	import com.android.systemui.plugins.FalsingManager;		import com.android.systemui.plugins.FalsingManager;
	import com.android.systemui.plugins.statusbar.StatusBarStateController;		import com.android.systemui.plugins.statusbar.StatusBarStateController;
			import com.android.systemui.shade.ShadeExpansionStateManager;
	import com.android.systemui.statusbar.LockscreenShadeTransitionController;		import com.android.systemui.statusbar.LockscreenShadeTransitionController;
	import com.android.systemui.statusbar.VibratorHelper;		import com.android.systemui.statusbar.VibratorHelper;
	import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
	import com.android.systemui.statusbar.phone.SystemUIDialogManager;		import com.android.systemui.statusbar.phone.SystemUIDialogManager;
	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.ConfigurationController;		import com.android.systemui.statusbar.policy.ConfigurationController;
	import com.android.systemui.statusbar.policy.KeyguardStateController;		import com.android.systemui.statusbar.policy.KeyguardStateController;
	import com.android.systemui.util.concurrency.DelayableExecutor;		import com.android.systemui.util.concurrency.DelayableExecutor;
	@@ -111,7 +111,7 @@ public class UdfpsController implements DozeReceiver {
	private final WindowManager mWindowManager;		private final WindowManager mWindowManager;
	private final DelayableExecutor mFgExecutor;		private final DelayableExecutor mFgExecutor;
	@NonNull private final Executor mBiometricExecutor;		@NonNull private final Executor mBiometricExecutor;
	@NonNull private final PanelExpansionStateManager mPanelExpansionStateManager;		@NonNull private final ShadeExpansionStateManager mShadeExpansionStateManager;
	@NonNull private final StatusBarStateController mStatusBarStateController;		@NonNull private final StatusBarStateController mStatusBarStateController;
	@NonNull private final KeyguardStateController mKeyguardStateController;		@NonNull private final KeyguardStateController mKeyguardStateController;
	@NonNull private final StatusBarKeyguardViewManager mKeyguardViewManager;		@NonNull private final StatusBarKeyguardViewManager mKeyguardViewManager;
	@@ -205,7 +205,7 @@ public class UdfpsController implements DozeReceiver {
	mFgExecutor.execute(() -> UdfpsController.this.showUdfpsOverlay(		mFgExecutor.execute(() -> UdfpsController.this.showUdfpsOverlay(
	new UdfpsControllerOverlay(mContext, mFingerprintManager, mInflater,		new UdfpsControllerOverlay(mContext, mFingerprintManager, mInflater,
	mWindowManager, mAccessibilityManager, mStatusBarStateController,		mWindowManager, mAccessibilityManager, mStatusBarStateController,
	mPanelExpansionStateManager, mKeyguardViewManager,		mShadeExpansionStateManager, mKeyguardViewManager,
	mKeyguardUpdateMonitor, mDialogManager, mDumpManager,		mKeyguardUpdateMonitor, mDialogManager, mDumpManager,
	mLockscreenShadeTransitionController, mConfigurationController,		mLockscreenShadeTransitionController, mConfigurationController,
	mSystemClock, mKeyguardStateController,		mSystemClock, mKeyguardStateController,
	@@ -582,7 +582,7 @@ public class UdfpsController implements DozeReceiver {
	@NonNull WindowManager windowManager,		@NonNull WindowManager windowManager,
	@NonNull StatusBarStateController statusBarStateController,		@NonNull StatusBarStateController statusBarStateController,
	@Main DelayableExecutor fgExecutor,		@Main DelayableExecutor fgExecutor,
	@NonNull PanelExpansionStateManager panelExpansionStateManager,		@NonNull ShadeExpansionStateManager shadeExpansionStateManager,
	@NonNull StatusBarKeyguardViewManager statusBarKeyguardViewManager,		@NonNull StatusBarKeyguardViewManager statusBarKeyguardViewManager,
	@NonNull DumpManager dumpManager,		@NonNull DumpManager dumpManager,
	@NonNull KeyguardUpdateMonitor keyguardUpdateMonitor,		@NonNull KeyguardUpdateMonitor keyguardUpdateMonitor,
	@@ -615,7 +615,7 @@ public class UdfpsController implements DozeReceiver {
	mFingerprintManager = checkNotNull(fingerprintManager);		mFingerprintManager = checkNotNull(fingerprintManager);