Merge "Replaced setQsExpanded calls in NPVC with listener" into tm-qpr-dev (0a851488) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/classifier/FalsingCollector.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -43,9 +43,6 @@ public interface FalsingCollector {
		/** */
		void onQsDown();

		/** */
		void setQsExpanded(boolean expanded);

		/** */
		boolean shouldEnforceBouncer();

packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorFake.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -48,10 +48,6 @@ public class FalsingCollectorFake implements FalsingCollector {
		public void onQsDown() {
		}

		@Override
		public void setQsExpanded(boolean expanded) {
		}

		@Override
		public boolean shouldEnforceBouncer() {
		return false;

packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorImpl.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -23,6 +23,8 @@ import android.hardware.biometrics.BiometricSourceType;
		import android.util.Log;
		import android.view.MotionEvent;

		import androidx.annotation.VisibleForTesting;

		import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.keyguard.KeyguardUpdateMonitorCallback;
		import com.android.systemui.dagger.SysUISingleton;
		@@ -30,6 +32,7 @@ import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.dock.DockManager;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.shade.ShadeExpansionStateManager;
		import com.android.systemui.statusbar.StatusBarState;
		import com.android.systemui.statusbar.policy.BatteryController;
		import com.android.systemui.statusbar.policy.BatteryController.BatteryStateChangeCallback;
		@@ -133,6 +136,7 @@ class FalsingCollectorImpl implements FalsingCollector {
		ProximitySensor proximitySensor,
		StatusBarStateController statusBarStateController,
		KeyguardStateController keyguardStateController,
		ShadeExpansionStateManager shadeExpansionStateManager,
		BatteryController batteryController,
		DockManager dockManager,
		@Main DelayableExecutor mainExecutor,
		@@ -157,6 +161,8 @@ class FalsingCollectorImpl implements FalsingCollector {

		mKeyguardUpdateMonitor.registerCallback(mKeyguardUpdateCallback);

		shadeExpansionStateManager.addQsExpansionListener(this::onQsExpansionChanged);

		mBatteryController.addCallback(mBatteryListener);
		mDockManager.addListener(mDockEventListener);
		}
		@@ -193,8 +199,8 @@ class FalsingCollectorImpl implements FalsingCollector {
		public void onQsDown() {
		}

		@Override
		public void setQsExpanded(boolean expanded) {
		@VisibleForTesting
		void onQsExpansionChanged(Boolean expanded) {
		if (expanded) {
		unregisterSensors();
		} else if (mSessionStarted) {

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+17 −7

Original line number	Diff line number	Diff line
		@@ -151,6 +151,8 @@ import com.android.systemui.media.KeyguardMediaController;
		import com.android.systemui.media.MediaDataManager;
		import com.android.systemui.media.MediaHierarchyManager;
		import com.android.systemui.model.SysUiState;
		import com.android.systemui.navigationbar.NavigationBarController;
		import com.android.systemui.navigationbar.NavigationBarView;
		import com.android.systemui.navigationbar.NavigationModeController;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.plugins.FalsingManager.FalsingTapListener;
		@@ -583,6 +585,7 @@ public final class NotificationPanelViewController {
		private final SysUiState mSysUiState;

		private final NotificationShadeDepthController mDepthController;
		private final NavigationBarController mNavigationBarController;
		private final int mDisplayId;

		private KeyguardIndicationController mKeyguardIndicationController;
		@@ -861,6 +864,7 @@ public final class NotificationPanelViewController {
		PrivacyDotViewController privacyDotViewController,
		TapAgainViewController tapAgainViewController,
		NavigationModeController navigationModeController,
		NavigationBarController navigationBarController,
		FragmentService fragmentService,
		ContentResolver contentResolver,
		RecordingController recordingController,
		@@ -954,6 +958,7 @@ public final class NotificationPanelViewController {
		mNotificationsQSContainerController = notificationsQSContainerController;
		mNotificationListContainer = notificationListContainer;
		mNotificationStackSizeCalculator = notificationStackSizeCalculator;
		mNavigationBarController = navigationBarController;
		mKeyguardBottomAreaViewControllerProvider = keyguardBottomAreaViewControllerProvider;
		mNotificationsQSContainerController.init();
		mNotificationStackScrollLayoutController = notificationStackScrollLayoutController;
		@@ -2681,12 +2686,16 @@ public final class NotificationPanelViewController {
		mQsExpanded = expanded;
		updateQsState();
		updateExpandedHeightToMaxHeight();
		mFalsingCollector.setQsExpanded(expanded);
		mCentralSurfaces.setQsExpanded(expanded);
		mNotificationsQSContainerController.setQsExpanded(expanded);
		mPulseExpansionHandler.setQsExpanded(expanded);
		mKeyguardBypassController.setQSExpanded(expanded);
		mPrivacyDotViewController.setQsExpanded(expanded);
		setStatusAccessibilityImportance(expanded
		? View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS
		: View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);
		updateSystemUiStateFlags();
		NavigationBarView navigationBarView =
		mNavigationBarController.getNavigationBarView(mDisplayId);
		if (navigationBarView != null) {
		navigationBarView.onStatusBarPanelStateChanged();
		}
		mShadeExpansionStateManager.onQsExpansionChanged(expanded);
		}
		}

		@@ -5193,7 +5202,8 @@ public final class NotificationPanelViewController {
		*/
		public void updatePanelExpansionAndVisibility() {
		mShadeExpansionStateManager.onPanelExpansionChanged(
		mExpandedFraction, isExpanded(), mTracking, mExpansionDragDownAmountPx);
		mExpandedFraction, isExpanded(),
		mTracking, mExpansionDragDownAmountPx);
		updateVisibility();
		}

packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -135,7 +135,8 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
		DumpManager dumpManager,
		KeyguardStateController keyguardStateController,
		ScreenOffAnimationController screenOffAnimationController,
		AuthController authController) {
		AuthController authController,
		ShadeExpansionStateManager shadeExpansionStateManager) {
		mContext = context;
		mWindowManager = windowManager;
		mActivityManager = activityManager;
		@@ -156,6 +157,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
		.addCallback(mStateListener,
		SysuiStatusBarStateController.RANK_STATUS_BAR_WINDOW_CONTROLLER);
		configurationController.addCallback(this);
		shadeExpansionStateManager.addQsExpansionListener(this::onQsExpansionChanged);

		float desiredPreferredRefreshRate = context.getResources()
		.getInteger(R.integer.config_keyguardRefreshRate);
		@@ -607,8 +609,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
		apply(mCurrentState);
		}

		@Override
		public void setQsExpanded(boolean expanded) {
		private void onQsExpansionChanged(Boolean expanded) {
		mCurrentState.mQsExpanded = expanded;
		apply(mCurrentState);
		}