Merge "[Minimal HUN] Add a developer setting to always show minimal HUN" into main (4b9422c3) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/HeadsUpStyleProvider.kt

+9 −3

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	package com.android.systemui.statusbar.notification.row		package com.android.systemui.statusbar.notification.row

	import android.app.Flags		import android.app.Flags
			import android.os.SystemProperties
	import com.android.systemui.statusbar.data.repository.StatusBarModeRepositoryStore		import com.android.systemui.statusbar.data.repository.StatusBarModeRepositoryStore
	import javax.inject.Inject		import javax.inject.Inject

	@@ -34,8 +35,13 @@ constructor(private val statusBarModeRepositoryStore: StatusBarModeRepositorySto
	HeadsUpStyleProvider {		HeadsUpStyleProvider {

	override fun shouldApplyCompactStyle(): Boolean {		override fun shouldApplyCompactStyle(): Boolean {
	// Use compact HUN for immersive mode.		return Flags.compactHeadsUpNotification() && (isInImmersiveMode() \|\| alwaysShow())
	return Flags.compactHeadsUpNotification() &&
	statusBarModeRepositoryStore.defaultDisplay.isInFullscreenMode.value
	}		}

			private fun isInImmersiveMode() =
			statusBarModeRepositoryStore.defaultDisplay.isInFullscreenMode.value

			/** developer setting to always show Minimal HUN, even if the device is not in full screen */
			private fun alwaysShow() =
			SystemProperties.getBoolean("persist.compact_heads_up_notification.always_show", false)
	}		}