Merge "Simplify generateHeadsUpAnimation to only take entry" into main (b97246a0) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -4362,8 +4362,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
		@Override
		public void onHeadsUpPinned(NotificationEntry entry) {
		if (!isKeyguardShowing()) {
		mNotificationStackScrollLayoutController.generateHeadsUpAnimation(
		entry.getHeadsUpAnimationView(), true);
		mNotificationStackScrollLayoutController.generateHeadsUpAnimation(entry, true);
		}
		}

		@@ -4375,8 +4374,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
		// notification
		// will stick to the top without any interaction.
		if (isFullyCollapsed() && entry.isRowHeadsUp() && !isKeyguardShowing()) {
		mNotificationStackScrollLayoutController.generateHeadsUpAnimation(
		entry.getHeadsUpAnimationView(), false);
		mNotificationStackScrollLayoutController.generateHeadsUpAnimation(entry, false);
		entry.setHeadsUpIsVisible();
		}
		}

+0 −4

Original line number	Diff line number	Diff line
		@@ -4869,10 +4869,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable

		public void generateHeadsUpAnimation(NotificationEntry entry, boolean isHeadsUp) {
		ExpandableNotificationRow row = entry.getHeadsUpAnimationView();
		generateHeadsUpAnimation(row, isHeadsUp);
		}

		public void generateHeadsUpAnimation(ExpandableNotificationRow row, boolean isHeadsUp) {
		final boolean add = mAnimationsEnabled && (isHeadsUp \|\| mHeadsUpGoingAwayAnimationsAllowed);
		if (SPEW) {
		Log.v(TAG, "generateHeadsUpAnimation:"

+1 −5

Original line number	Diff line number	Diff line
		@@ -1495,14 +1495,10 @@ public class NotificationStackScrollLayoutController implements Dumpable {
		return mView.getFirstChildNotGone();
		}

		private void generateHeadsUpAnimation(NotificationEntry entry, boolean isHeadsUp) {
		public void generateHeadsUpAnimation(NotificationEntry entry, boolean isHeadsUp) {
		mView.generateHeadsUpAnimation(entry, isHeadsUp);
		}

		public void generateHeadsUpAnimation(ExpandableNotificationRow row, boolean isHeadsUp) {
		mView.generateHeadsUpAnimation(row, isHeadsUp);
		}

		public void setMaxTopPadding(int padding) {
		mView.setMaxTopPadding(padding);
		}