diff options
20 files changed, 116 insertions, 180 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/data/repository/QSColumnsRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/data/repository/QSColumnsRepositoryTest.kt deleted file mode 100644 index fd1f52b9d8c8..000000000000 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/data/repository/QSColumnsRepositoryTest.kt +++ /dev/null @@ -1,83 +0,0 @@ -/* - * 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.qs.panels.data.repository - -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.common.ui.data.repository.fakeConfigurationRepository -import com.android.systemui.coroutines.collectLastValue -import com.android.systemui.kosmos.testCase -import com.android.systemui.kosmos.testScope -import com.android.systemui.res.R -import com.android.systemui.shade.shared.flag.DualShade -import com.android.systemui.testKosmos -import com.google.common.truth.Truth.assertThat -import kotlinx.coroutines.test.runTest -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith - -@SmallTest -@RunWith(AndroidJUnit4::class) -class QSColumnsRepositoryTest : SysuiTestCase() { - private val kosmos = testKosmos() - private lateinit var underTest: QSColumnsRepository - - @Before - fun setUp() { - underTest = with(kosmos) { qsColumnsRepository } - } - - @Test - fun configChanges_triggerColumnsUpdate() = - with(kosmos) { - testScope.runTest { - val latest by collectLastValue(underTest.columns) - - setColumnsInConfig(4) - assertThat(latest).isEqualTo(4) - - setColumnsInConfig(8) - assertThat(latest).isEqualTo(8) - } - } - - @Test - @EnableFlags(DualShade.FLAG_NAME) - fun withDualShade_returnsCorrectValue() = - with(kosmos) { - testScope.runTest { - val latest by collectLastValue(underTest.columns) - assertThat(latest).isEqualTo(4) - - setColumnsInConfig(8, id = R.integer.quick_settings_dual_shade_num_columns) - // Asserts config changes are ignored - assertThat(latest).isEqualTo(4) - } - } - - private fun setColumnsInConfig( - columns: Int, - id: Int = R.integer.quick_settings_infinite_grid_num_columns, - ) = - with(kosmos) { - testCase.context.orCreateTestableResources.addOverride(id, columns) - fakeConfigurationRepository.onConfigurationChange() - } -} diff --git a/packages/SystemUI/res/values-land/config.xml b/packages/SystemUI/res/values-land/config.xml index b5efeb5f6b3b..db526b187d38 100644 --- a/packages/SystemUI/res/values-land/config.xml +++ b/packages/SystemUI/res/values-land/config.xml @@ -25,9 +25,6 @@ <integer name="quick_settings_num_columns">4</integer> - <!-- The number of columns in the infinite grid QuickSettings --> - <integer name="quick_settings_infinite_grid_num_columns">8</integer> - <!-- The number of columns that the top level tiles span in the QuickSettings --> <integer name="quick_settings_user_time_settings_tile_span">2</integer> diff --git a/packages/SystemUI/res/values-sw600dp-port/config.xml b/packages/SystemUI/res/values-sw600dp-port/config.xml index 7daad1a43f73..857e162d4f14 100644 --- a/packages/SystemUI/res/values-sw600dp-port/config.xml +++ b/packages/SystemUI/res/values-sw600dp-port/config.xml @@ -24,9 +24,6 @@ <!-- The number of columns in the QuickSettings --> <integer name="quick_settings_num_columns">3</integer> - <!-- The number of columns in the infinite grid QuickSettings --> - <integer name="quick_settings_infinite_grid_num_columns">6</integer> - <integer name="power_menu_lite_max_columns">2</integer> <integer name="power_menu_lite_max_rows">3</integer> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 6f94f9e2a216..38ef0e9d5df4 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -73,9 +73,6 @@ <!-- The number of columns in the infinite grid QuickSettings --> <integer name="quick_settings_infinite_grid_num_columns">4</integer> - <!-- The number of columns in the Dual Shade QuickSettings --> - <integer name="quick_settings_dual_shade_num_columns">4</integer> - <!-- Override column number for quick settings. For now, this value has effect only when flag lockscreen.enable_landscape is enabled. TODO (b/293252410) - change this comment/resource when flag is enabled --> diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/dagger/PanelsModule.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/dagger/PanelsModule.kt index 31e867efba03..1fe54e46fee1 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/dagger/PanelsModule.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/dagger/PanelsModule.kt @@ -31,12 +31,12 @@ import com.android.systemui.qs.panels.ui.compose.GridLayout import com.android.systemui.qs.panels.ui.compose.PaginatableGridLayout import com.android.systemui.qs.panels.ui.compose.PaginatedGridLayout import com.android.systemui.qs.panels.ui.compose.infinitegrid.InfiniteGridLayout +import com.android.systemui.qs.panels.ui.viewmodel.FixedColumnsSizeViewModel +import com.android.systemui.qs.panels.ui.viewmodel.FixedColumnsSizeViewModelImpl import com.android.systemui.qs.panels.ui.viewmodel.IconLabelVisibilityViewModel import com.android.systemui.qs.panels.ui.viewmodel.IconLabelVisibilityViewModelImpl import com.android.systemui.qs.panels.ui.viewmodel.IconTilesViewModel import com.android.systemui.qs.panels.ui.viewmodel.IconTilesViewModelImpl -import com.android.systemui.qs.panels.ui.viewmodel.QSColumnsSizeViewModelImpl -import com.android.systemui.qs.panels.ui.viewmodel.QSColumnsViewModel import dagger.Binds import dagger.Module import dagger.Provides @@ -55,7 +55,7 @@ interface PanelsModule { @Binds fun bindIconTilesViewModel(impl: IconTilesViewModelImpl): IconTilesViewModel - @Binds fun bindQSColumnsViewModel(impl: QSColumnsSizeViewModelImpl): QSColumnsViewModel + @Binds fun bindGridSizeViewModel(impl: FixedColumnsSizeViewModelImpl): FixedColumnsSizeViewModel @Binds fun bindIconLabelVisibilityViewModel( diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/FixedColumnsRepository.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/FixedColumnsRepository.kt new file mode 100644 index 000000000000..32ce973cbe58 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/FixedColumnsRepository.kt @@ -0,0 +1,30 @@ +/* + * 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.qs.panels.data.repository + +import com.android.systemui.dagger.SysUISingleton +import javax.inject.Inject +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow + +@SysUISingleton +class FixedColumnsRepository @Inject constructor() { + // Number of columns in the narrowest state for consistency + private val _columns = MutableStateFlow(4) + val columns: StateFlow<Int> = _columns.asStateFlow() +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QSColumnsRepository.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QSColumnsRepository.kt deleted file mode 100644 index 082f622248a1..000000000000 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QSColumnsRepository.kt +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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.qs.panels.data.repository - -import android.content.res.Resources -import com.android.systemui.common.ui.data.repository.ConfigurationRepository -import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.dagger.qualifiers.Application -import com.android.systemui.dagger.qualifiers.Main -import com.android.systemui.res.R -import com.android.systemui.shade.shared.flag.DualShade -import com.android.systemui.util.kotlin.emitOnStart -import javax.inject.Inject -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.flow.SharingStarted -import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.flowOf -import kotlinx.coroutines.flow.mapLatest -import kotlinx.coroutines.flow.stateIn - -@OptIn(ExperimentalCoroutinesApi::class) -@SysUISingleton -class QSColumnsRepository -@Inject -constructor( - @Application scope: CoroutineScope, - @Main private val resources: Resources, - configurationRepository: ConfigurationRepository, -) { - val columns: StateFlow<Int> = - if (DualShade.isEnabled) { - flowOf(resources.getInteger(R.integer.quick_settings_dual_shade_num_columns)) - } else { - configurationRepository.onConfigurationChange.emitOnStart().mapLatest { - resources.getInteger(R.integer.quick_settings_infinite_grid_num_columns) - } - } - .stateIn( - scope, - SharingStarted.WhileSubscribed(), - resources.getInteger(R.integer.quick_settings_infinite_grid_num_columns), - ) -} diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/QSColumnsInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/FixedColumnsSizeInteractor.kt index 9b45c568dcad..9591002b3d3d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/QSColumnsInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/FixedColumnsSizeInteractor.kt @@ -17,11 +17,11 @@ package com.android.systemui.qs.panels.domain.interactor import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.qs.panels.data.repository.QSColumnsRepository +import com.android.systemui.qs.panels.data.repository.FixedColumnsRepository import javax.inject.Inject import kotlinx.coroutines.flow.StateFlow @SysUISingleton -class QSColumnsInteractor @Inject constructor(repo: QSColumnsRepository) { +class FixedColumnsSizeInteractor @Inject constructor(repo: FixedColumnsRepository) { val columns: StateFlow<Int> = repo.columns } diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/InfiniteGridLayout.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/InfiniteGridLayout.kt index 6920e498bdde..3ba49add530e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/InfiniteGridLayout.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/InfiniteGridLayout.kt @@ -31,8 +31,8 @@ import com.android.systemui.qs.panels.shared.model.SizedTileImpl import com.android.systemui.qs.panels.ui.compose.PaginatableGridLayout import com.android.systemui.qs.panels.ui.compose.rememberEditListState import com.android.systemui.qs.panels.ui.viewmodel.EditTileViewModel +import com.android.systemui.qs.panels.ui.viewmodel.FixedColumnsSizeViewModel import com.android.systemui.qs.panels.ui.viewmodel.IconTilesViewModel -import com.android.systemui.qs.panels.ui.viewmodel.QSColumnsViewModel import com.android.systemui.qs.panels.ui.viewmodel.TileSquishinessViewModel import com.android.systemui.qs.panels.ui.viewmodel.TileViewModel import com.android.systemui.qs.pipeline.shared.TileSpec @@ -45,7 +45,7 @@ class InfiniteGridLayout @Inject constructor( private val iconTilesViewModel: IconTilesViewModel, - private val gridSizeViewModel: QSColumnsViewModel, + private val gridSizeViewModel: FixedColumnsSizeViewModel, private val squishinessViewModel: TileSquishinessViewModel, ) : PaginatableGridLayout { diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QSColumnsViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/FixedColumnsSizeViewModel.kt index 0f1c77eb4711..865c86b4096d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QSColumnsViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/FixedColumnsSizeViewModel.kt @@ -17,16 +17,16 @@ package com.android.systemui.qs.panels.ui.viewmodel import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.qs.panels.domain.interactor.QSColumnsInteractor +import com.android.systemui.qs.panels.domain.interactor.FixedColumnsSizeInteractor import javax.inject.Inject import kotlinx.coroutines.flow.StateFlow -interface QSColumnsViewModel { +interface FixedColumnsSizeViewModel { val columns: StateFlow<Int> } @SysUISingleton -class QSColumnsSizeViewModelImpl @Inject constructor(interactor: QSColumnsInteractor) : - QSColumnsViewModel { +class FixedColumnsSizeViewModelImpl @Inject constructor(interactor: FixedColumnsSizeInteractor) : + FixedColumnsSizeViewModel { override val columns: StateFlow<Int> = interactor.columns } diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/PaginatedGridViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/PaginatedGridViewModel.kt index 78212b2ac3cc..d4f82983469b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/PaginatedGridViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/PaginatedGridViewModel.kt @@ -29,13 +29,13 @@ class PaginatedGridViewModel @Inject constructor( iconTilesViewModel: IconTilesViewModel, - gridSizeViewModel: QSColumnsViewModel, + gridSizeViewModel: FixedColumnsSizeViewModel, iconLabelVisibilityViewModel: IconLabelVisibilityViewModel, paginatedGridInteractor: PaginatedGridInteractor, @Application applicationScope: CoroutineScope, ) : IconTilesViewModel by iconTilesViewModel, - QSColumnsViewModel by gridSizeViewModel, + FixedColumnsSizeViewModel by gridSizeViewModel, IconLabelVisibilityViewModel by iconLabelVisibilityViewModel { val rows = paginatedGridInteractor.rows.stateIn( diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/PartitionedGridViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/PartitionedGridViewModel.kt new file mode 100644 index 000000000000..2049edbd544f --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/PartitionedGridViewModel.kt @@ -0,0 +1,32 @@ +/* + * 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.qs.panels.ui.viewmodel + +import com.android.systemui.dagger.SysUISingleton +import javax.inject.Inject + +@SysUISingleton +class PartitionedGridViewModel +@Inject +constructor( + iconTilesViewModel: IconTilesViewModel, + gridSizeViewModel: FixedColumnsSizeViewModel, + iconLabelVisibilityViewModel: IconLabelVisibilityViewModel, +) : + IconTilesViewModel by iconTilesViewModel, + FixedColumnsSizeViewModel by gridSizeViewModel, + IconLabelVisibilityViewModel by iconLabelVisibilityViewModel diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModel.kt index 72b586a2f4df..88e3019ba163 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModel.kt @@ -40,14 +40,14 @@ class QuickQuickSettingsViewModel @Inject constructor( tilesInteractor: CurrentTilesInteractor, - qsColumnsViewModel: QSColumnsViewModel, + fixedColumnsSizeViewModel: FixedColumnsSizeViewModel, quickQuickSettingsRowInteractor: QuickQuickSettingsRowInteractor, val squishinessViewModel: TileSquishinessViewModel, private val iconTilesViewModel: IconTilesViewModel, @Application private val applicationScope: CoroutineScope, ) { - val columns = qsColumnsViewModel.columns + val columns = fixedColumnsSizeViewModel.columns private val rows = quickQuickSettingsRowInteractor.rows.stateIn( diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/data/repository/QSColumnsRepositoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/data/repository/FixedColumnsRepositoryKosmos.kt index 0ca025f53df4..2f5daaa35286 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/data/repository/QSColumnsRepositoryKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/data/repository/FixedColumnsRepositoryKosmos.kt @@ -16,12 +16,6 @@ package com.android.systemui.qs.panels.data.repository -import android.content.res.mainResources -import com.android.systemui.common.ui.data.repository.configurationRepository import com.android.systemui.kosmos.Kosmos -import com.android.systemui.kosmos.applicationCoroutineScope -val Kosmos.qsColumnsRepository by - Kosmos.Fixture { - QSColumnsRepository(applicationCoroutineScope, mainResources, configurationRepository) - } +val Kosmos.fixedColumnsRepository by Kosmos.Fixture { FixedColumnsRepository() } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/domain/interactor/QSColumnsInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/domain/interactor/FixedColumnsSizeInteractorKosmos.kt index 02ed2648107b..f4d281db627b 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/domain/interactor/QSColumnsInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/domain/interactor/FixedColumnsSizeInteractorKosmos.kt @@ -17,6 +17,7 @@ package com.android.systemui.qs.panels.domain.interactor import com.android.systemui.kosmos.Kosmos -import com.android.systemui.qs.panels.data.repository.qsColumnsRepository +import com.android.systemui.qs.panels.data.repository.fixedColumnsRepository -val Kosmos.qsColumnsInteractor by Kosmos.Fixture { QSColumnsInteractor(qsColumnsRepository) } +val Kosmos.fixedColumnsSizeInteractor by + Kosmos.Fixture { FixedColumnsSizeInteractor(fixedColumnsRepository) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/domain/interactor/InfiniteGridLayoutKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/domain/interactor/InfiniteGridLayoutKosmos.kt index b4317ad71efd..546129fe340e 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/domain/interactor/InfiniteGridLayoutKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/domain/interactor/InfiniteGridLayoutKosmos.kt @@ -18,11 +18,11 @@ package com.android.systemui.qs.panels.domain.interactor import com.android.systemui.kosmos.Kosmos import com.android.systemui.qs.panels.ui.compose.infinitegrid.InfiniteGridLayout +import com.android.systemui.qs.panels.ui.viewmodel.fixedColumnsSizeViewModel import com.android.systemui.qs.panels.ui.viewmodel.iconTilesViewModel -import com.android.systemui.qs.panels.ui.viewmodel.qsColumnsViewModel import com.android.systemui.qs.panels.ui.viewmodel.tileSquishinessViewModel val Kosmos.infiniteGridLayout by Kosmos.Fixture { - InfiniteGridLayout(iconTilesViewModel, qsColumnsViewModel, tileSquishinessViewModel) + InfiniteGridLayout(iconTilesViewModel, fixedColumnsSizeViewModel, tileSquishinessViewModel) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/QSColumnsViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/FixedColumnsSizeViewModelKosmos.kt index 16b2f5438797..feadc9133bbf 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/QSColumnsViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/FixedColumnsSizeViewModelKosmos.kt @@ -17,6 +17,7 @@ package com.android.systemui.qs.panels.ui.viewmodel import com.android.systemui.kosmos.Kosmos -import com.android.systemui.qs.panels.domain.interactor.qsColumnsInteractor +import com.android.systemui.qs.panels.domain.interactor.fixedColumnsSizeInteractor -val Kosmos.qsColumnsViewModel by Kosmos.Fixture { QSColumnsSizeViewModelImpl(qsColumnsInteractor) } +val Kosmos.fixedColumnsSizeViewModel by + Kosmos.Fixture { FixedColumnsSizeViewModelImpl(fixedColumnsSizeInteractor) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/PaginatedGridViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/PaginatedGridViewModelKosmos.kt index 10d8e1e22487..85e92651cba2 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/PaginatedGridViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/PaginatedGridViewModelKosmos.kt @@ -24,7 +24,7 @@ val Kosmos.paginatedGridViewModel by Kosmos.Fixture { PaginatedGridViewModel( iconTilesViewModel, - qsColumnsViewModel, + fixedColumnsSizeViewModel, iconLabelVisibilityViewModel, paginatedGridInteractor, applicationCoroutineScope, diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/PartitionedGridViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/PartitionedGridViewModelKosmos.kt new file mode 100644 index 000000000000..fde174d7241e --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/PartitionedGridViewModelKosmos.kt @@ -0,0 +1,28 @@ +/* + * 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.qs.panels.ui.viewmodel + +import com.android.systemui.kosmos.Kosmos + +val Kosmos.partitionedGridViewModel by + Kosmos.Fixture { + PartitionedGridViewModel( + iconTilesViewModel, + fixedColumnsSizeViewModel, + iconLabelVisibilityViewModel, + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModelKosmos.kt index 67d9e0ed552b..babbd50ece98 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModelKosmos.kt @@ -25,7 +25,7 @@ val Kosmos.quickQuickSettingsViewModel by Kosmos.Fixture { QuickQuickSettingsViewModel( currentTilesInteractor, - qsColumnsViewModel, + fixedColumnsSizeViewModel, quickQuickSettingsRowInteractor, tileSquishinessViewModel, iconTilesViewModel, |