Merge "Inline notifications_footer_visibility_fix flag" into main (f6ca06d5) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -115,16 +115,6 @@ flag {
		bug: "294347738"
		}

		flag {
		name: "notifications_footer_visibility_fix"
		namespace: "systemui"
		description: "Fixes a bug where the footer would briefly appear when dismissing a HUN"
		bug: "356552869"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "notifications_icon_container_refactor"
		namespace: "systemui"

+8 −10

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import android.view.ViewGroup;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.policy.SystemBarUtils;
		import com.android.keyguard.BouncerPanelExpansionCalculator;
		import com.android.systemui.Flags;
		import com.android.systemui.animation.ShadeInterpolation;
		import com.android.systemui.res.R;
		import com.android.systemui.scene.shared.flag.SceneContainerFlag;
		@@ -475,17 +474,16 @@ public class StackScrollAlgorithm {
		emptyShadeVisible = true;
		}
		if (!SceneContainerFlag.isEnabled() && v instanceof FooterView footerView) {
		if (emptyShadeVisible \|\| notGoneIndex == 0) {
		// if the empty shade is visible or the footer is the first visible
		// If the empty shade is visible or the footer is the first visible
		// view, we're in a transitory state so let's leave the footer alone.
		if (Flags.notificationsFooterVisibilityFix()) {
		if (emptyShadeVisible \|\| notGoneIndex == 0) {
		// ...except for the hidden state, to prevent it from flashing on
		// the screen (this piece is copied from updateChild, and is not
		// necessary in flexiglass).
		if (footerView.shouldBeHidden() \|\| !ambientState.isShadeExpanded()) {
		footerView.getViewState().hidden = true;
		}
		}

		continue;
		}
		}