Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6dcae2a8 authored Mar 04, 2025 by András Kurucz Committed by Android (Google) Code Review Mar 04, 2025

Merge changes Iee64480b,I41ad7a0c into main

* changes:
  [Flexiglass] Update the new HeadsUpAnimator from the HUN placeholder
  Stop using NotificationsHunSharedAnimationValues.assertInNewMode()

parents cdaf6e7b 0704ef7b

packages/SystemUI/src/com/android/systemui/statusbar/notification/headsup/HeadsUpAnimator.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ class HeadsUpAnimator(context: Context, private val systemBarUtilsProxy: SystemB
		* of the animation.
		*/
		fun getHeadsUpYTranslation(isHeadsUpFromBottom: Boolean, hasStatusBarChip: Boolean): Int {
		NotificationsHunSharedAnimationValues.unsafeAssertInNewMode()
		if (NotificationsHunSharedAnimationValues.isUnexpectedlyInLegacyMode()) return 0

		if (isHeadsUpFromBottom) {
		// start from or end at the bottom of the screen

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -1290,7 +1290,9 @@ public class NotificationStackScrollLayout
		@Override
		public void setHeadsUpBottom(float headsUpBottom) {
		if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) return;
		if (mAmbientState.getHeadsUpBottom() != headsUpBottom) {
		if (NotificationsHunSharedAnimationValues.isEnabled()) {
		mHeadsUpAnimator.setHeadsUpAppearHeightBottom(Math.round(headsUpBottom));
		} else if (mAmbientState.getHeadsUpBottom() != headsUpBottom) {
		mAmbientState.setHeadsUpBottom(headsUpBottom);
		mStateAnimator.setHeadsUpAppearHeightBottom(Math.round(headsUpBottom));
		}