Merge "Fix transparent content view when opening the shade during bubble fly out" into main (9b44a32b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -3218,7 +3218,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		}

		@Override
		protected void resetAllContentAlphas() {
		public void resetAllContentAlphas() {
		mLogger.logResetAllContentAlphas(getEntry());
		mPrivateLayout.setAlpha(1f);
		mPrivateLayout.setLayerType(LAYER_TYPE_NONE, null);

+14 −0

Original line number	Diff line number	Diff line
		@@ -113,6 +113,7 @@ import com.android.systemui.statusbar.notification.row.ActivatableNotificationVi
		import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
		import com.android.systemui.statusbar.notification.row.ExpandableView;
		import com.android.systemui.statusbar.notification.row.StackScrollerDecorView;
		import com.android.systemui.statusbar.notification.shared.NotificationContentAlphaOptimization;
		import com.android.systemui.statusbar.notification.shared.NotificationHeadsUpCycling;
		import com.android.systemui.statusbar.notification.shared.NotificationThrottleHun;
		import com.android.systemui.statusbar.notification.shared.NotificationsImprovedHunAnimation;
		@@ -4372,6 +4373,16 @@ public class NotificationStackScrollLayout
		}
		}

		private void resetChildAlpha() {
		for (int i = 0; i < getChildCount(); i++) {
		ExpandableView child = getChildAtIndex(i);
		if (child instanceof ExpandableNotificationRow row) {
		if (row.isExpandAnimationRunning()) continue;
		row.resetAllContentAlphas();
		}
		}
		}

		private void logTransientNotificationRowTraversalCleaned(
		ExpandableNotificationRow transientView,
		String reason
		@@ -4415,6 +4426,9 @@ public class NotificationStackScrollLayout
		if (SceneContainerFlag.isEnabled()) {
		setHeadsUpAnimatingAway(false);
		}
		if (NotificationContentAlphaOptimization.isEnabled()) {
		resetChildAlpha();
		}
		} else {
		mGroupExpansionManager.collapseGroups();
		mExpandHelper.cancelImmediately();