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

Commit dc8cdfe7 authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "[ENR] Skip hide sensitive notification anim" into main

parents 1468a6f9 f275f865
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -2026,3 +2026,13 @@ flag {
        purpose: PURPOSE_BUGFIX
    }
}

flag {
    name: "skip_hide_sensitive_notif_animation"
    namespace: "systemui"
    description: "Skip hide sensitive notification animation when the showing layout is not changed."
    bug: "390624334"
    metadata {
        purpose: PURPOSE_BUGFIX
   }
}
+5 −2
Original line number Diff line number Diff line
@@ -3227,11 +3227,14 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
        }
        boolean oldShowingPublic = mShowingPublic;
        mShowingPublic = mSensitive && hideSensitive;
        if (mShowingPublicInitialized && mShowingPublic == oldShowingPublic) {
        boolean isShowingLayoutNotChanged = mShowingPublic == oldShowingPublic;
        if (mShowingPublicInitialized && isShowingLayoutNotChanged) {
            return;
        }

        if (!animated) {
        final boolean shouldSkipHideSensitiveAnimation =
                Flags.skipHideSensitiveNotifAnimation() && isShowingLayoutNotChanged;
        if (!animated || shouldSkipHideSensitiveAnimation) {
            if (!NotificationContentAlphaOptimization.isEnabled()
                    || mShowingPublic != oldShowingPublic) {
                // Don't reset the alpha or cancel the animation if the showing layout doesn't