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

Commit da51853a authored by amehfooz's avatar amehfooz Committed by Ahmed Mehfooz
Browse files

[ROSP] Add ColorsModel for StatusBarPopupChips 

This CL makes the popup chips color scheme configurable by introducing ColorsModel.
Additionally, the PopupChipModel has been moved into the UI layer
which is the most appropriate layer for it.

Bug:413207866
Test: Make sure the media control chip UI is unchanged
Flag: com.android.systemui.status_bar_popup_chips

Change-Id: Ia91dcf9b48e1042095829e6c109a94d751c915c8
parent f25c221d

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/featurepods/media/ui/viewmodel/MediaControlChipViewModelTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import com.android.systemui.media.controls.domain.pipeline.MediaDataManager 
import com.android.systemui.media.controls.shared.model.MediaData

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.statusbar.featurepods.media.domain.interactor.mediaControlChipInteractor

import com.android.systemui.statusbar.featurepods.popups.shared.model.PopupChipModel

import com.android.systemui.statusbar.featurepods.popups.ui.model.PopupChipModel

import com.android.systemui.testKosmos

import com.google.common.truth.Truth.assertThat

import kotlin.test.Test

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

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import com.android.systemui.lifecycle.activateIn 
import com.android.systemui.media.controls.data.repository.mediaFilterRepository

import com.android.systemui.media.controls.shared.model.MediaData

import com.android.systemui.statusbar.featurepods.popups.StatusBarPopupChips

import com.android.systemui.statusbar.featurepods.popups.shared.model.PopupChipId

import com.android.systemui.statusbar.featurepods.popups.ui.model.PopupChipId

import com.android.systemui.statusbar.featurepods.popups.ui.viewmodel.statusBarPopupChipsViewModelFactory

import com.android.systemui.testKosmos

import com.google.common.truth.Truth.assertThat

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/featurepods/vc/ui/viewmodel/AvControlsChipViewModelTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ import com.android.systemui.privacy.PrivacyApplication 
import com.android.systemui.privacy.PrivacyItem

import com.android.systemui.privacy.PrivacyType

import com.android.systemui.shade.data.repository.fakePrivacyChipRepository

import com.android.systemui.statusbar.featurepods.popups.shared.model.PopupChipId

import com.android.systemui.statusbar.featurepods.popups.shared.model.PopupChipModel

import com.android.systemui.statusbar.featurepods.popups.ui.model.PopupChipId

import com.android.systemui.statusbar.featurepods.popups.ui.model.PopupChipModel

import com.android.systemui.statusbar.featurepods.vc.domain.interactor.avControlsChipInteractor

import com.android.systemui.testKosmos

import com.google.common.truth.Truth.assertThat

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/FakeHomeStatusBarViewModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import com.android.systemui.statusbar.chips.ui.model.MultipleOngoingActivityChip 
import com.android.systemui.statusbar.chips.ui.model.MultipleOngoingActivityChipsModelLegacy

import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.events.shared.model.SystemEventAnimationState.Idle

import com.android.systemui.statusbar.featurepods.popups.shared.model.PopupChipModel

import com.android.systemui.statusbar.featurepods.popups.ui.model.PopupChipModel

import com.android.systemui.statusbar.phone.domain.interactor.IsAreaDark

import com.android.systemui.statusbar.pipeline.battery.ui.viewmodel.BatteryNextToPercentViewModel

import com.android.systemui.statusbar.pipeline.battery.ui.viewmodel.UnifiedBatteryViewModel

packages/SystemUI/src/com/android/systemui/statusbar/featurepods/av/ui/viewmodel/AvControlsChipViewModel.kt

+4 −4
Original line number Diff line number Diff line
@@ -14,15 +14,15 @@ 
 * limitations under the License.

 */



package com.android.systemui.statusbar.featurepods.vc.ui.viewmodel

package com.android.systemui.statusbar.featurepods.av.ui.viewmodel



import androidx.compose.runtime.getValue

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

import com.android.systemui.lifecycle.ExclusiveActivatable

import com.android.systemui.lifecycle.Hydrator

import com.android.systemui.statusbar.featurepods.popups.shared.model.ChipIcon

import com.android.systemui.statusbar.featurepods.popups.shared.model.PopupChipId

import com.android.systemui.statusbar.featurepods.popups.shared.model.PopupChipModel

import com.android.systemui.statusbar.featurepods.popups.ui.model.ChipIcon

import com.android.systemui.statusbar.featurepods.popups.ui.model.PopupChipId

import com.android.systemui.statusbar.featurepods.popups.ui.model.PopupChipModel

import com.android.systemui.statusbar.featurepods.popups.ui.viewmodel.StatusBarPopupChipViewModel

import com.android.systemui.statusbar.featurepods.vc.domain.interactor.AvControlsChipInteractor

import com.android.systemui.statusbar.featurepods.vc.shared.model.AvControlsChipModel