Merge "Use a row instead of the entry for tracking the topHeadsUp" into main (7af4060e) · Commits · e / os / android_frameworks_base

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

+8 −7

Original line number	Diff line number	Diff line
		@@ -573,7 +573,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		* Do notifications dismiss with normal transitioning
		*/
		private boolean mDismissUsingRowTranslationX = true;
		private NotificationEntry mTopHeadsUpEntry;
		private ExpandableNotificationRow mTopHeadsUpRow;
		private long mNumHeadsUp;
		private NotificationStackScrollLayoutController.TouchHandler mTouchHandler;
		private final ScreenOffAnimationController mScreenOffAnimationController;
		@@ -1688,10 +1688,10 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		* is mainly used when dragging down from a heads up notification.
		*/
		private int getTopHeadsUpPinnedHeight() {
		if (mTopHeadsUpEntry == null) {
		if (mTopHeadsUpRow == null) {
		return 0;
		}
		ExpandableNotificationRow row = mTopHeadsUpEntry.getRow();
		ExpandableNotificationRow row = mTopHeadsUpRow;
		if (row.isChildInGroup()) {
		final NotificationEntry groupSummary =
		mGroupMembershipManager.getGroupSummary(row.getEntry());
		@@ -1872,8 +1872,9 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		if (slidingChild instanceof ExpandableNotificationRow row) {
		NotificationEntry entry = row.getEntry();
		if (!mIsExpanded && row.isHeadsUp() && row.isPinned()
		&& mTopHeadsUpEntry.getRow() != row
		&& mGroupMembershipManager.getGroupSummary(mTopHeadsUpEntry) != entry) {
		&& mTopHeadsUpRow != row
		&& mGroupMembershipManager.getGroupSummary(mTopHeadsUpRow.getEntry())
		!= entry) {
		continue;
		}
		return row.getViewAtPosition(touchY - childTop);
		@@ -5724,8 +5725,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		mShelf.updateAppearance();
		}

		void setTopHeadsUpEntry(NotificationEntry topEntry) {
		mTopHeadsUpEntry = topEntry;
		void setTopHeadsUpRow(ExpandableNotificationRow topHeadsUpRow) {
		mTopHeadsUpRow = topHeadsUpRow;
		}

		void setNumHeadsUp(long numHeadsUp) {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -692,7 +692,7 @@ public class NotificationStackScrollLayoutController implements Dumpable {
		long numEntries = mHeadsUpManager.getAllEntries().count();
		NotificationEntry topEntry = mHeadsUpManager.getTopEntry();
		mView.setNumHeadsUp(numEntries);
		mView.setTopHeadsUpEntry(topEntry);
		mView.setTopHeadsUpRow(topEntry != null ? topEntry.getRow() : null);
		generateHeadsUpAnimation(entry, isHeadsUp);
		}
		};