Merge "Remove unused methods from NotificationListContainer" into main (71668f72) · Commits · e / os / android_frameworks_base

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

+0 −27

Original line number	Diff line number	Diff line
		@@ -66,18 +66,6 @@ public interface NotificationListContainer extends
		*/
		void notifyGroupChildRemoved(ExpandableView row, ViewGroup childrenContainer);

		/**
		* Generate an animation for an added child view.
		* @param child The view to be added.
		* @param fromMoreCard Whether this add is coming from the "more" card on lockscreen.
		*/
		void generateAddAnimation(ExpandableView child, boolean fromMoreCard);

		/**
		* Generate a child order changed event.
		*/
		void generateChildOrderChangedEvent();

		/**
		* Returns the number of children in the NotificationListContainer.
		*
		@@ -186,21 +174,6 @@ public interface NotificationListContainer extends
		*/
		default void bindRow(ExpandableNotificationRow row) {}

		/**
		* Does this list contain a given view. True by default is fine, since we only ask this if the
		* view has a parent.
		*/
		default boolean containsView(View v) {
		return true;
		}

		/**
		* Tells the container that an animation is about to expand it.
		*/
		default void setWillExpand(boolean willExpand) {}

		void setNotificationActivityStarter(NotificationActivityStarter notificationActivityStarter);

		/**
		* @return the start location where we start clipping notifications.
		*/

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

+0 −18

Original line number	Diff line number	Diff line
		@@ -324,7 +324,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		private NotificationsController mNotificationsController;
		private ActivityStarter mActivityStarter;
		private final int[] mTempInt2 = new int[2];
		private boolean mGenerateChildOrderChangedEvent;
		private final HashSet<Runnable> mAnimationFinishedRunnables = new HashSet<>();
		private final HashSet<ExpandableView> mClearTransientViewsWhenFinished = new HashSet<>();
		private final HashSet<Pair<ExpandableNotificationRow, Boolean>> mHeadsUpChangeAnimations
		@@ -3144,10 +3143,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		requestChildrenUpdate();
		}

		public boolean containsView(View v) {
		return v.getParent() == this;
		}

		public void applyLaunchAnimationParams(LaunchAnimationParameters params) {
		// Modify the clipping for launching notifications
		mLaunchAnimationParams = params;
		@@ -3410,11 +3405,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		mAnimationEvents.add(animEvent);
		}
		mChildrenChangingPositions.clear();
		if (mGenerateChildOrderChangedEvent) {
		mAnimationEvents.add(new AnimationEvent(null,
		AnimationEvent.ANIMATION_TYPE_CHANGE_POSITION));
		mGenerateChildOrderChangedEvent = false;
		}
		}

		private void generateChildAdditionEvents() {
		@@ -4764,14 +4754,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		info.setClassName(ScrollView.class.getName());
		}

		public void generateChildOrderChangedEvent() {
		if (mIsExpanded && mAnimationsEnabled) {
		mGenerateChildOrderChangedEvent = true;
		mNeedsAnimation = true;
		requestChildrenUpdate();
		}
		}

		public int getContainerChildCount() {
		return getChildCount();
		}

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

+0 −27

Original line number	Diff line number	Diff line
		@@ -1724,28 +1724,11 @@ public class NotificationStackScrollLayoutController {
		mView.notifyGroupChildRemoved(row, childrenContainer);
		}

		@Override
		public void generateAddAnimation(ExpandableView child, boolean fromMoreCard) {
		mView.generateAddAnimation(child, fromMoreCard);
		}

		@Override
		public void generateChildOrderChangedEvent() {
		mView.generateChildOrderChangedEvent();
		}

		@Override
		public int getContainerChildCount() {
		return mView.getContainerChildCount();
		}

		@Override
		public void setNotificationActivityStarter(
		NotificationActivityStarter notificationActivityStarter) {
		NotificationStackScrollLayoutController.this
		.setNotificationActivityStarter(notificationActivityStarter);
		}

		@Override
		public int getTopClippingStartLocation() {
		return mView.getTopClippingStartLocation();
		@@ -1840,16 +1823,6 @@ public class NotificationStackScrollLayoutController {
		mView.setExpandingNotification(row);
		}

		@Override
		public boolean containsView(View v) {
		return mView.containsView(v);
		}

		@Override
		public void setWillExpand(boolean willExpand) {
		mView.setWillExpand(willExpand);
		}

		@Override
		public void dumpPipeline(@NonNull PipelineDumper d) {
		d.dump("NotificationStackScrollLayoutController.this",