diff options
3 files changed, 82 insertions, 1 deletions
diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig index 426b24dfe070..0b1811079155 100644 --- a/packages/SystemUI/aconfig/systemui.aconfig +++ b/packages/SystemUI/aconfig/systemui.aconfig @@ -1557,3 +1557,13 @@ flag { description: "Enables the tile detailed view UI." bug: "374173773" } + +flag { + name: "ensure_enr_views_visibility" + namespace: "systemui" + description: "Ensures public and private visibilities" + bug: "361552380" + metadata { + purpose: PURPOSE_BUGFIX + } +}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/EnsureEnrViewsVisibility.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/EnsureEnrViewsVisibility.kt new file mode 100644 index 000000000000..aa63f4ddbd45 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/EnsureEnrViewsVisibility.kt @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.notification.row + +import com.android.systemui.Flags +import com.android.systemui.flags.FlagToken +import com.android.systemui.flags.RefactorFlagUtils + +/** Helper for reading or using the ensure enr views visibility flag state. */ +@Suppress("NOTHING_TO_INLINE") +object EnsureEnrViewsVisibility { + /** The aconfig flag name */ + const val FLAG_NAME = Flags.FLAG_ENSURE_ENR_VIEWS_VISIBILITY + + /** A token used for dependency declaration */ + val token: FlagToken + get() = FlagToken(FLAG_NAME, isEnabled) + + /** Is the refactor enabled */ + @JvmStatic + inline val isEnabled + get() = Flags.ensureEnrViewsVisibility() + + /** + * Called to ensure code is only run when the flag is enabled. This protects users from the + * unintended behaviors caused by accidentally running new logic, while also crashing on an eng + * build to ensure that the refactor author catches issues in testing. + */ + @JvmStatic + inline fun isUnexpectedlyInLegacyMode() = + RefactorFlagUtils.isUnexpectedlyInLegacyMode(isEnabled, FLAG_NAME) + + /** + * Called to ensure code is only run when the flag is disabled. This will throw an exception if + * the flag is not enabled to ensure that the refactor author catches issues in testing. + * Caution!! Using this check incorrectly will cause crashes in nextfood builds! + */ + @JvmStatic + inline fun assertInNewMode() = RefactorFlagUtils.assertInNewMode(isEnabled, FLAG_NAME) + + /** + * Called to ensure code is only run when the flag is disabled. This will throw an exception if + * the flag is enabled to ensure that the refactor author catches issues in testing. + */ + @JvmStatic + inline fun assertInLegacyMode() = RefactorFlagUtils.assertInLegacyMode(isEnabled, FLAG_NAME) +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java index 933f79341b27..a4c43a1b65c2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java @@ -2507,6 +2507,10 @@ public class ExpandableNotificationRow extends ActivatableNotificationView } private void updateChildrenVisibility() { + if (EnsureEnrViewsVisibility.isEnabled()) { + mPublicLayout.setVisibility(mShowingPublic ? View.VISIBLE : View.INVISIBLE); + } + boolean hideContentWhileLaunching = mExpandAnimationRunning && mGuts != null && mGuts.isExposed(); mPrivateLayout.setVisibility(!mShowingPublic && !mIsSummaryWithChildren @@ -3073,7 +3077,13 @@ public class ExpandableNotificationRow extends ActivatableNotificationView } else { mLogger.logSkipResetAllContentAlphas(getEntry()); } - mPublicLayout.setVisibility(mShowingPublic ? View.VISIBLE : View.INVISIBLE); + + if (!EnsureEnrViewsVisibility.isEnabled()) { + // mPublicLayout.setVisibility moved to updateChildrenVisibility when the flag is on + // in order to ensure public and private views are not visible + // together at the same time. + mPublicLayout.setVisibility(mShowingPublic ? View.VISIBLE : View.INVISIBLE); + } updateChildrenVisibility(); } else { animateShowingPublic(delay, duration, mShowingPublic); |