Merge "Show shade footer when hun is posted while shade is open" into sc-dev am: 0a1d974bad

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15175803

Change-Id: Ifec6121fa6993dec95c6af5c0b0b7d84a3f625bc
This commit is contained in:
Jay Aliomer
2021-07-08 17:55:56 +00:00
committed by Automerger Merge Worker

View File

@@ -681,8 +681,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
boolean showDismissView = mClearAllEnabled &&
mController.hasActiveClearableNotifications(ROWS_ALL);
RemoteInputController remoteInputController = mRemoteInputManager.getController();
boolean showFooterView = (showDismissView || mController.hasActiveNotifications())
&& mEmptyShadeView.getVisibility() == GONE
boolean showFooterView = (showDismissView || getVisibleNotificationCount() > 0)
&& mStatusBarState != StatusBarState.KEYGUARD
&& !mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()
&& (remoteInputController == null || !remoteInputController.isRemoteInputActive());