Merge "Do not show the notification footer until the user is set up." into sc-qpr1-dev (114f3ee9) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -260,6 +260,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		private boolean mExpandedInThisMotion;
		private boolean mShouldShowShelfOnly;
		protected boolean mScrollingEnabled;
		private boolean mIsCurrentUserSetup;
		protected FooterView mFooterView;
		protected EmptyShadeView mEmptyShadeView;
		private boolean mDismissAllInProgress;
		@@ -687,6 +688,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		mController.hasActiveClearableNotifications(ROWS_ALL);
		RemoteInputController remoteInputController = mRemoteInputManager.getController();
		boolean showFooterView = (showDismissView \|\| getVisibleNotificationCount() > 0)
		&& mIsCurrentUserSetup // see: b/193149550
		&& mStatusBarState != StatusBarState.KEYGUARD
		&& !mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()
		&& (remoteInputController == null \|\| !remoteInputController.isRemoteInputActive());
		@@ -5598,6 +5600,16 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		mAnimateNextTopPaddingChange = true;
		}

		/**
		* Sets whether the current user is set up, which is required to show the footer (b/193149550)
		*/
		public void setCurrentUserSetup(boolean isCurrentUserSetup) {
		if (mIsCurrentUserSetup != isCurrentUserSetup) {
		mIsCurrentUserSetup = isCurrentUserSetup;
		updateFooter();
		}
		}

		/**
		* A listener that is notified when the empty space below the notifications is clicked on
		*/

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java

+30 −0

Original line number	Diff line number	Diff line
		@@ -117,6 +117,8 @@ import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.statusbar.phone.dagger.StatusBarComponent;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener;
		import com.android.systemui.statusbar.policy.DeviceProvisionedController;
		import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener;
		import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener;
		import com.android.systemui.statusbar.policy.ZenModeController;
		import com.android.systemui.tuner.TunerService;
		@@ -144,6 +146,7 @@ public class NotificationStackScrollLayoutController {
		private final HeadsUpManagerPhone mHeadsUpManager;
		private final NotificationRoundnessManager mNotificationRoundnessManager;
		private final TunerService mTunerService;
		private final DeviceProvisionedController mDeviceProvisionedController;
		private final DynamicPrivacyController mDynamicPrivacyController;
		private final ConfigurationController mConfigurationController;
		private final ZenModeController mZenModeController;
		@@ -219,6 +222,28 @@ public class NotificationStackScrollLayoutController {
		}
		};

		private final DeviceProvisionedListener mDeviceProvisionedListener =
		new DeviceProvisionedListener() {
		@Override
		public void onDeviceProvisionedChanged() {
		updateCurrentUserIsSetup();
		}

		@Override
		public void onUserSwitched() {
		updateCurrentUserIsSetup();
		}

		@Override
		public void onUserSetupChanged() {
		updateCurrentUserIsSetup();
		}

		private void updateCurrentUserIsSetup() {
		mView.setCurrentUserSetup(mDeviceProvisionedController.isCurrentUserSetup());
		}
		};

		private final DynamicPrivacyController.Listener mDynamicPrivacyControllerListener = () -> {
		if (mView.isExpanded()) {
		// The bottom might change because we're using the final actual height of the view
		@@ -588,6 +613,7 @@ public class NotificationStackScrollLayoutController {
		HeadsUpManagerPhone headsUpManager,
		NotificationRoundnessManager notificationRoundnessManager,
		TunerService tunerService,
		DeviceProvisionedController deviceProvisionedController,
		DynamicPrivacyController dynamicPrivacyController,
		ConfigurationController configurationController,
		SysuiStatusBarStateController statusBarStateController,
		@@ -624,6 +650,7 @@ public class NotificationStackScrollLayoutController {
		mHeadsUpManager = headsUpManager;
		mNotificationRoundnessManager = notificationRoundnessManager;
		mTunerService = tunerService;
		mDeviceProvisionedController = deviceProvisionedController;
		mDynamicPrivacyController = dynamicPrivacyController;
		mConfigurationController = configurationController;
		mStatusBarStateController = statusBarStateController;
		@@ -762,6 +789,9 @@ public class NotificationStackScrollLayoutController {
		return Unit.INSTANCE;
		});

		// callback is invoked synchronously, updating mView immediately
		mDeviceProvisionedController.addCallback(mDeviceProvisionedListener);

		if (mView.isAttachedToWindow()) {
		mOnAttachStateChangeListener.onViewAttachedToWindow(mView);
		}

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java

+23 −0

Original line number	Diff line number	Diff line
		@@ -290,6 +290,8 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase {
		@Test
		public void testUpdateFooter_noNotifications() {
		setBarStateForTest(StatusBarState.SHADE);
		mStackScroller.setCurrentUserSetup(true);

		FooterView view = mock(FooterView.class);
		mStackScroller.setFooterView(view);
		mStackScroller.updateFooter();
		@@ -299,6 +301,7 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase {
		@Test
		public void testUpdateFooter_remoteInput() {
		setBarStateForTest(StatusBarState.SHADE);
		mStackScroller.setCurrentUserSetup(true);

		ExpandableNotificationRow row = mock(ExpandableNotificationRow.class);
		when(row.canViewBeDismissed()).thenReturn(true);
		@@ -318,6 +321,7 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase {
		@Test
		public void testUpdateFooter_oneClearableNotification() {
		setBarStateForTest(StatusBarState.SHADE);
		mStackScroller.setCurrentUserSetup(true);

		when(mEmptyShadeView.getVisibility()).thenReturn(GONE);
		when(mStackScrollLayoutController.hasActiveClearableNotifications(ROWS_ALL))
		@@ -330,9 +334,26 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase {
		verify(mStackScroller).updateFooterView(true, true, true);
		}

		@Test
		public void testUpdateFooter_oneClearableNotification_beforeUserSetup() {
		setBarStateForTest(StatusBarState.SHADE);
		mStackScroller.setCurrentUserSetup(false);

		when(mEmptyShadeView.getVisibility()).thenReturn(GONE);
		when(mStackScrollLayoutController.hasActiveClearableNotifications(ROWS_ALL))
		.thenReturn(true);
		when(mStackScrollLayoutController.hasActiveNotifications()).thenReturn(true);

		FooterView view = mock(FooterView.class);
		mStackScroller.setFooterView(view);
		mStackScroller.updateFooter();
		verify(mStackScroller).updateFooterView(false, true, true);
		}

		@Test
		public void testUpdateFooter_oneNonClearableNotification() {
		setBarStateForTest(StatusBarState.SHADE);
		mStackScroller.setCurrentUserSetup(true);

		ExpandableNotificationRow row = mock(ExpandableNotificationRow.class);
		when(row.canViewBeDismissed()).thenReturn(false);
		@@ -351,6 +372,8 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase {

		@Test
		public void testUpdateFooter_atEnd() {
		mStackScroller.setCurrentUserSetup(true);

		// add footer
		mStackScroller.inflateFooterView();

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollerControllerTest.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,7 @@ import com.android.systemui.statusbar.phone.ScrimController;
		import com.android.systemui.statusbar.phone.ShadeController;
		import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.statusbar.policy.DeviceProvisionedController;
		import com.android.systemui.statusbar.policy.ZenModeController;
		import com.android.systemui.tuner.TunerService;

		@@ -98,6 +99,7 @@ public class NotificationStackScrollerControllerTest extends SysuiTestCase {
		@Mock private HeadsUpManagerPhone mHeadsUpManager;
		@Mock private NotificationRoundnessManager mNotificationRoundnessManager;
		@Mock private TunerService mTunerService;
		@Mock private DeviceProvisionedController mDeviceProvisionedController;
		@Mock private DynamicPrivacyController mDynamicPrivacyController;
		@Mock private ConfigurationController mConfigurationController;
		@Mock private NotificationStackScrollLayout mNotificationStackScrollLayout;
		@@ -153,6 +155,7 @@ public class NotificationStackScrollerControllerTest extends SysuiTestCase {
		mHeadsUpManager,
		mNotificationRoundnessManager,
		mTunerService,
		mDeviceProvisionedController,
		mDynamicPrivacyController,
		mConfigurationController,
		mSysuiStatusBarStateController,