Merge changes I65d67bf9,Ibeee6718 into tm-qpr-dev (7168e6c9) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -1337,19 +1337,7 @@ public class BubbleController implements ConfigurationChangeListener {
		}
		mSysuiProxy.updateNotificationBubbleButton(bubble.getKey());
		}

		}
		mSysuiProxy.getPendingOrActiveEntry(bubble.getKey(), (entry) -> {
		mMainExecutor.execute(() -> {
		if (entry != null) {
		final String groupKey = entry.getStatusBarNotification().getGroupKey();
		if (getBubblesInGroup(groupKey).isEmpty()) {
		// Time to potentially remove the summary
		mSysuiProxy.notifyMaybeCancelSummary(bubble.getKey());
		}
		}
		});
		});
		}
		mDataRepository.removeBubbles(mCurrentUserId, bubblesToBeRemovedFromRepository);

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubbles.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -276,8 +276,6 @@ public interface Bubbles {

		void notifyInvalidateNotifications(String reason);

		void notifyMaybeCancelSummary(String key);

		void updateNotificationBubbleButton(String key);

		void onStackExpandChanged(boolean shouldExpand);

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/BubbleCoordinator.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -144,11 +144,6 @@ public class BubbleCoordinator implements Coordinator {
		public void invalidateNotifications(String reason) {
		mNotifFilter.invalidateList(reason);
		}

		@Override
		public void maybeCancelSummary(NotificationEntry entry) {
		// no-op
		}
		};

		private boolean isInterceptingDismissal(NotificationEntry entry) {

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

+2 −23

Original line number	Diff line number	Diff line
		@@ -2794,10 +2794,9 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		if (mDebugRemoveAnimation) {
		Log.d(TAG, "generateRemove " + key
		+ "\nmIsExpanded " + mIsExpanded
		+ "\nmAnimationsEnabled " + mAnimationsEnabled
		+ "\n!invisible group " + !isChildInInvisibleGroup(child));
		+ "\nmAnimationsEnabled " + mAnimationsEnabled);
		}
		if (mIsExpanded && mAnimationsEnabled && !isChildInInvisibleGroup(child)) {
		if (mIsExpanded && mAnimationsEnabled) {
		if (!mChildrenToAddAnimated.contains(child)) {
		if (mDebugRemoveAnimation) {
		Log.d(TAG, "needsAnimation = true " + key);
		@@ -2845,26 +2844,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		return hasAddEvent && mAddedHeadsUpChildren.contains(child);
		}

		// TODO (b/162832756): remove since this won't happen in new pipeline (we prune groups in
		// ShadeListBuilder)
		/**
		* @param child the child to query
		* @return whether a view is not a top level child but a child notification and that group is
		* not expanded
		*/
		@ShadeViewRefactor(RefactorComponent.ADAPTER)
		private boolean isChildInInvisibleGroup(View child) {
		if (child instanceof ExpandableNotificationRow) {
		ExpandableNotificationRow row = (ExpandableNotificationRow) child;
		NotificationEntry groupSummary =
		mGroupMembershipManager.getGroupSummary(row.getEntry());
		if (groupSummary != null && groupSummary.getRow() != row) {
		return row.getVisibility() == View.INVISIBLE;
		}
		}
		return false;
		}

		/**
		* Updates the scroll position when a child was removed
		*

packages/SystemUI/src/com/android/systemui/wmshell/BubblesManager.java

+0 −22

Original line number	Diff line number	Diff line
		@@ -310,18 +310,6 @@ public class BubblesManager {
		});
		}

		@Override
		public void notifyMaybeCancelSummary(String key) {
		sysuiMainExecutor.execute(() -> {
		final NotificationEntry entry = mCommonNotifCollection.getEntry(key);
		if (entry != null) {
		for (NotifCallback cb : mCallbacks) {
		cb.maybeCancelSummary(entry);
		}
		}
		});
		}

		@Override
		public void updateNotificationBubbleButton(String key) {
		sysuiMainExecutor.execute(() -> {
		@@ -646,15 +634,5 @@ public class BubblesManager {
		* filtered from the shade.
		*/
		void invalidateNotifications(@NonNull String reason);

		/**
		* Called on a bubbled entry that has been removed when there are no longer
		* bubbled entries in its group.
		*
		* Checks whether its group has any other (non-bubbled) children. If it doesn't,
		* removes all remnants of the group's summary from the notification pipeline.
		* TODO: (b/145659174) Only old pipeline needs this - delete post-migration.
		*/
		void maybeCancelSummary(@NonNull NotificationEntry entry);
		}
		}