Merge "New Pipeline: plumb isChangingPosition" (34c22039) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/RootNodeController.kt

+3 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.systemui.statusbar.notification.collection.render

		import android.view.View
		import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow
		import com.android.systemui.statusbar.notification.row.ExpandableView
		import com.android.systemui.statusbar.notification.stack.NotificationListContainer

		@@ -41,6 +42,7 @@ class RootNodeController(
		override fun addChildAt(child: NodeController, index: Int) {
		listContainer.addContainerViewAt(child.view, index)
		listContainer.onNotificationViewUpdateFinished()
		(child.view as? ExpandableNotificationRow)?.isChangingPosition = false
		}

		override fun moveChildTo(child: NodeController, index: Int) {
		@@ -50,6 +52,7 @@ class RootNodeController(
		override fun removeChild(child: NodeController, isTransfer: Boolean) {
		if (isTransfer) {
		listContainer.setChildTransferInProgress(true)
		(child.view as? ExpandableNotificationRow)?.isChangingPosition = true
		}
		listContainer.removeContainerView(child.view)
		if (isTransfer) {

+6 −0

Original line number	Diff line number	Diff line
		@@ -248,19 +248,25 @@ public class ExpandableNotificationRowController implements NotifViewController

		mView.addChildNotification((ExpandableNotificationRow) child.getView(), index);
		mListContainer.notifyGroupChildAdded(childView);
		childView.setChangingPosition(false);
		}

		@Override
		public void moveChildTo(NodeController child, int index) {
		ExpandableNotificationRow childView = (ExpandableNotificationRow) child.getView();
		childView.setChangingPosition(true);
		mView.removeChildNotification(childView);
		mView.addChildNotification(childView, index);
		childView.setChangingPosition(false);
		}

		@Override
		public void removeChild(NodeController child, boolean isTransfer) {
		ExpandableNotificationRow childView = (ExpandableNotificationRow) child.getView();

		if (isTransfer) {
		childView.setChangingPosition(true);
		}
		mView.removeChildNotification(childView);
		if (!isTransfer) {
		mListContainer.notifyGroupChildRemoved(childView, mView);