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

Commit 8a529cf1 authored by Olivier St-Onge's avatar Olivier St-Onge
Browse files

Implement extra large tile tiles on large font size 

This increases the size of the large tiles when the font scaling is past a threshold

Test: manually
Flag: com.android.systemui.qs_ui_refactor_compose_fragment
Bug: 331601141
Change-Id: I63c0d7c4d70cd5d193951f75d3d7e9fce5e0e791
parent 13d32366

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/compose/EditTileListStateTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import org.junit.runner.RunWith 
@SmallTest

@RunWith(AndroidJUnit4::class)

class EditTileListStateTest : SysuiTestCase() {

    private val underTest = EditTileListState(TestEditTiles, 4)

    private val underTest = EditTileListState(TestEditTiles, columns = 4, largeTilesSpan = 2)



    @Test

    fun startDrag_listHasSpacers() {

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

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ 
    <!-- The number of columns in the infinite grid QuickSettings -->

    <integer name="quick_settings_infinite_grid_num_columns">6</integer>



    <!-- The maximum width of large tiles in the infinite grid QuickSettings -->

    <integer name="quick_settings_infinite_grid_tile_max_width">3</integer>



    <integer name="power_menu_lite_max_columns">2</integer>

    <integer name="power_menu_lite_max_rows">3</integer>

packages/SystemUI/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -79,6 +79,9 @@ 
    <!-- The number of columns in the infinite grid QuickSettings -->

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



    <!-- The maximum width of large tiles in the infinite grid QuickSettings -->

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



    <!-- The number of columns in the Dual Shade QuickSettings -->

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

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

0 → 100644
+60 −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.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.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.distinctUntilChanged

import kotlinx.coroutines.flow.mapLatest

import kotlinx.coroutines.flow.stateIn



@OptIn(ExperimentalCoroutinesApi::class)

@SysUISingleton

class LargeTileSpanRepository

@Inject

constructor(

    @Application scope: CoroutineScope,

    @Main private val resources: Resources,

    configurationRepository: ConfigurationRepository,

) {

    val span: StateFlow<Int> =

        configurationRepository.onConfigurationChange

            .emitOnStart()

            .mapLatest {

                if (resources.configuration.fontScale >= FONT_SCALE_THRESHOLD) {

                    resources.getInteger(R.integer.quick_settings_infinite_grid_tile_max_width)

                } else {

                    2

                }

            }

            .distinctUntilChanged()

            .stateIn(scope, SharingStarted.WhileSubscribed(), 2)



    private companion object {

        const val FONT_SCALE_THRESHOLD = 2f

    }

}

packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/IconTilesInteractor.kt

+5 −0
Original line number Diff line number Diff line
@@ -21,12 +21,14 @@ import com.android.systemui.dagger.qualifiers.Application 
import com.android.systemui.log.LogBuffer

import com.android.systemui.log.core.LogLevel

import com.android.systemui.qs.panels.data.repository.DefaultLargeTilesRepository

import com.android.systemui.qs.panels.data.repository.LargeTileSpanRepository

import com.android.systemui.qs.panels.shared.model.PanelsLog

import com.android.systemui.qs.pipeline.domain.interactor.CurrentTilesInteractor

import com.android.systemui.qs.pipeline.shared.TileSpec

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.flow.SharingStarted

import kotlinx.coroutines.flow.StateFlow

import kotlinx.coroutines.flow.onEach

import kotlinx.coroutines.flow.stateIn
@@ -38,6 +40,7 @@ constructor( 
    private val repo: DefaultLargeTilesRepository,

    private val currentTilesInteractor: CurrentTilesInteractor,

    private val preferencesInteractor: QSPreferencesInteractor,

    largeTilesSpanRepo: LargeTileSpanRepository,

    @PanelsLog private val logBuffer: LogBuffer,

    @Application private val applicationScope: CoroutineScope,

) {
@@ -46,6 +49,8 @@ constructor( 
            .onEach { logChange(it) }

            .stateIn(applicationScope, SharingStarted.Eagerly, repo.defaultLargeTiles)



    val largeTilesSpan: StateFlow<Int> = largeTilesSpanRepo.span



    fun isIconTile(spec: TileSpec): Boolean = !largeTilesSpecs.value.contains(spec)



    fun setLargeTiles(specs: Set<TileSpec>) {