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

Commit aab30aa5 authored Oct 14, 2024 by Olivier St-Onge

Add rows config for QS and QQS for bc25

Flag: com.android.systemui.qs_ui_refactor_compose_fragment
Fixes: 373009020
Test: QuickQuickSettingsViewModelTest.kt
Test: QqsPanelTilesLandscape
Test: QqsPanelTilesPortrait
Change-Id: If992b5b268429bc3e1755824d92121dbd287a994

parent 72db988d

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/data/repository/PaginatedGridRepositoryTest.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -54,7 +54,7 @@ class PaginatedGridRepositoryTest : SysuiTestCase() {
	private fun setRowsInConfig(rows: Int) =		private fun setRowsInConfig(rows: Int) =
	with(kosmos) {		with(kosmos) {
	testCase.context.orCreateTestableResources.addOverride(		testCase.context.orCreateTestableResources.addOverride(
	R.integer.quick_settings_max_rows,		R.integer.quick_settings_paginated_grid_num_rows,
	rows,		rows,
	)		)
	fakeConfigurationRepository.onConfigurationChange()		fakeConfigurationRepository.onConfigurationChange()

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/data/repository/QuickQuickSettingsRowRepositoryTest.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -54,7 +54,7 @@ class QuickQuickSettingsRowRepositoryTest : SysuiTestCase() {
	private fun setRowsInConfig(rows: Int) =		private fun setRowsInConfig(rows: Int) =
	with(kosmos) {		with(kosmos) {
	testCase.context.orCreateTestableResources.addOverride(		testCase.context.orCreateTestableResources.addOverride(
	R.integer.quick_qs_panel_max_rows,		R.integer.quick_qs_paginated_grid_num_rows,
	rows,		rows,
	)		)
	fakeConfigurationRepository.onConfigurationChange()		fakeConfigurationRepository.onConfigurationChange()

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModelTest.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -151,7 +151,7 @@ class QuickQuickSettingsViewModelTest : SysuiTestCase() {

	private fun Kosmos.setRows(rows: Int) {		private fun Kosmos.setRows(rows: Int) {
	testCase.context.orCreateTestableResources.addOverride(		testCase.context.orCreateTestableResources.addOverride(
	R.integer.quick_qs_panel_max_rows,		R.integer.quick_qs_paginated_grid_num_rows,
	rows,		rows,
	)		)
	fakeConfigurationRepository.onConfigurationChange()		fakeConfigurationRepository.onConfigurationChange()

packages/SystemUI/res/values-land/config.xml

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,12 @@

	<integer name="quick_settings_num_columns">4</integer>		<integer name="quick_settings_num_columns">4</integer>

			<!-- The number of rows in the paginated grid QuickSettings -->
			<integer name="quick_settings_paginated_grid_num_rows">2</integer>

			<!-- The number of rows in the paginated grid QuickQuickSettings -->
			<integer name="quick_qs_paginated_grid_num_rows">1</integer>

	<!-- The number of columns in the infinite grid QuickSettings -->		<!-- The number of columns in the infinite grid QuickSettings -->
	<integer name="quick_settings_infinite_grid_num_columns">8</integer>		<integer name="quick_settings_infinite_grid_num_columns">8</integer>

packages/SystemUI/res/values-sw600dp-land/config.xml

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,12 @@
	<!-- Whether to use the split 2-column notification shade -->		<!-- Whether to use the split 2-column notification shade -->
	<bool name="config_use_split_notification_shade">true</bool>		<bool name="config_use_split_notification_shade">true</bool>

			<!-- The number of rows in the paginated grid QuickSettings -->
			<integer name="quick_settings_paginated_grid_num_rows">3</integer>

			<!-- The number of rows in the paginated grid QuickQuickSettings -->
			<integer name="quick_qs_paginated_grid_num_rows">2</integer>

	<!-- The number of columns in the QuickSettings -->		<!-- The number of columns in the QuickSettings -->
	<integer name="quick_settings_num_columns">2</integer>		<integer name="quick_settings_num_columns">2</integer>