Merge changes I4f1bc2ec,Iaf1a59e0 into main (72977ba6) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+10 −0

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

		flag {
		name: "notification_transparent_header_fix"
		namespace: "systemui"
		description: "fix the transparent group header issue for async header inflation."
		bug: "340161724"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "pss_app_selector_abrupt_exit_fix"
		namespace: "systemui"

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -104,6 +104,7 @@ import com.android.systemui.statusbar.notification.row.shared.AsyncGroupHeaderVi
		import com.android.systemui.statusbar.notification.row.wrapper.NotificationCompactMessagingTemplateViewWrapper;
		import com.android.systemui.statusbar.notification.row.wrapper.NotificationViewWrapper;
		import com.android.systemui.statusbar.notification.shared.NotificationContentAlphaOptimization;
		import com.android.systemui.statusbar.notification.shared.TransparentHeaderFix;
		import com.android.systemui.statusbar.notification.stack.AmbientState;
		import com.android.systemui.statusbar.notification.stack.AnimationProperties;
		import com.android.systemui.statusbar.notification.stack.ExpandableViewState;
		@@ -1584,6 +1585,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		/* headerView= */ headerView,
		/* onClickListener= */ mExpandClickListener
		);
		if (TransparentHeaderFix.isEnabled()) {
		updateBackgroundForGroupState();
		}
		}

		/**

packages/SystemUI/src/com/android/systemui/statusbar/notification/shared/TransparentHeaderFix.kt

0 → 100644

+53 −0

Original line number	Diff line number	Diff line
		/*
		* 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.shared

		import com.android.systemui.Flags
		import com.android.systemui.flags.FlagToken
		import com.android.systemui.flags.RefactorFlagUtils

		/** Helper for reading or using the notification transparent header fix flag state. */
		@Suppress("NOTHING_TO_INLINE")
		object TransparentHeaderFix {
		/** The aconfig flag name */
		const val FLAG_NAME = Flags.FLAG_NOTIFICATION_TRANSPARENT_HEADER_FIX

		/** A token used for dependency declaration */
		val token: FlagToken
		get() = FlagToken(FLAG_NAME, isEnabled)

		/** Is the flag enabled */
		@JvmStatic
		inline val isEnabled
		get() = Flags.notificationTransparentHeaderFix()

		/**
		* 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 enabled to ensure that the refactor author catches issues in testing.
		*/
		@JvmStatic
		inline fun assertInLegacyMode() = RefactorFlagUtils.assertInLegacyMode(isEnabled, FLAG_NAME)
		}