[ROSP] Add view models skeletons for popup chips (32569f3a) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+7 −0

Original line number	Diff line number	Diff line
		@@ -495,6 +495,13 @@ flag {
		bug: "361346412"
		}

		flag {
		name: "status_bar_popup_chips"
		namespace: "systemui"
		description: "Show rich ongoing processes as chips in the status bar"
		bug: "372964148"
		}

		flag {
		name: "promote_notifications_automatically"
		namespace: "systemui"

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/featurepods/popups/ui/viewmodel/StatusBarPopupChipsViewModelTest.kt

0 → 100644

+46 −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.featurepods.popups.ui.viewmodel

		import android.platform.test.annotations.EnableFlags
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.statusbar.chips.notification.shared.StatusBarPopupChips
		import com.android.systemui.testKosmos
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.test.runTest
		import org.junit.Test
		import org.junit.runner.RunWith

		@SmallTest
		@EnableFlags(StatusBarPopupChips.FLAG_NAME)
		@RunWith(AndroidJUnit4::class)
		class StatusBarPopupChipsViewModelTest : SysuiTestCase() {
		private val kosmos = testKosmos()
		private val testScope = kosmos.testScope
		private val underTest = kosmos.statusBarPopupChipsViewModel

		@Test
		fun popupChips_allHidden_empty() =
		testScope.runTest {
		val latest by collectLastValue(underTest.popupChips)
		assertThat(latest).isEmpty()
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/featurepods/popups/StatusBarPopupChips.kt

0 → 100644

+61 −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.chips.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 status bar popup chips flag state. */
		@Suppress("NOTHING_TO_INLINE")
		object StatusBarPopupChips {
		/** The aconfig flag name */
		const val FLAG_NAME = Flags.FLAG_STATUS_BAR_POPUP_CHIPS

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

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

		/**
		* 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)
		}

packages/SystemUI/src/com/android/systemui/statusbar/featurepods/popups/shared/model/PopupChipModel.kt

0 → 100644

+49 −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.featurepods.popups.shared.model

		import com.android.systemui.common.shared.model.Icon

		/**
		* Ids used to track different types of popup chips. Will be used to ensure only one chip is
		* displaying its popup at a time.
		*/
		sealed class PopupChipId(val value: String) {
		data object MediaControls : PopupChipId("MediaControls")
		}

		/** Model for individual status bar popup chips. */
		sealed class PopupChipModel {
		abstract val logName: String
		abstract val chipId: PopupChipId

		data class Hidden(override val chipId: PopupChipId, val shouldAnimate: Boolean = true) :
		PopupChipModel() {
		override val logName = "Hidden(id=$chipId, anim=$shouldAnimate)"
		}

		data class Shown(
		override val chipId: PopupChipId,
		val icon: Icon,
		val chipText: String,
		val isToggled: Boolean = false,
		val onToggle: () -> Unit,
		val onIconPressed: () -> Unit,
		) : PopupChipModel() {
		override val logName = "Shown(id=$chipId, toggled=$isToggled)"
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/featurepods/popups/ui/viewmodel/StatusBarPopupChipViewModel.kt

0 → 100644

+29 −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.featurepods.popups.ui.viewmodel

		import com.android.systemui.statusbar.featurepods.popups.shared.model.PopupChipModel
		import kotlinx.coroutines.flow.StateFlow

		/**
		* Interface for a view model that knows the display requirements for a single type of status bar
		* popup chip.
		*/
		interface StatusBarPopupChipViewModel {
		/** A flow modeling the popup chip that should be shown (or not shown). */
		val chip: StateFlow<PopupChipModel>
		}