Merge "Update notif corner roundness on drag and snapback" (74d95a7e) · Commits · e / os / android_frameworks_base

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -2554,12 +2554,13 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		int childCount = getChildCount();
		for (int i = 0; i < childCount; i++) {
		ExpandableView child = (ExpandableView) getChildAt(i);
		if (child.getVisibility() != View.GONE && !(child instanceof StackScrollerDecorView)
		&& child != mShelf) {
		if (child.getVisibility() != View.GONE
		&& !(child instanceof StackScrollerDecorView)
		&& child != mShelf
		&& !mAmbientState.getDraggedViews().contains(child)) {
		children.add(child);
		}
		}

		return children;
		}

		@@ -5524,10 +5525,12 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable

		void addDraggedView(View view) {
		mAmbientState.onBeginDrag(view);
		updateFirstAndLastBackgroundViews();
		}

		void removeDraggedView(View view) {
		mAmbientState.onDragFinished(view);
		updateFirstAndLastBackgroundViews();
		}

		void setTopHeadsUpEntry(NotificationEntry topEntry) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -463,7 +463,7 @@ public class NotificationStackScrollLayoutController {

		@Override
		public void onChildSnappedBack(View animView, float targetLeft) {
		mView.addDraggedView(animView);
		mView.removeDraggedView(animView);
		mView.updateContinuousShadowDrawing();
		mView.updateContinuousBackgroundDrawing();
		if (animView instanceof ExpandableNotificationRow) {