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

Commit 93fd1c63 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix font scaling QS tile dialog" into main

parents 9f21709b 7746db30

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/fontscaling/FontScalingDialogDelegateTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.systemui.common.domain.interactor.SysUIStateDisplaysInteracto 
import com.android.systemui.common.ui.view.SeekBarWithIconButtonsView

import com.android.systemui.res.R

import com.android.systemui.settings.UserTracker

import com.android.systemui.shade.domain.interactor.FakeShadeDialogContextInteractor

import com.android.systemui.statusbar.phone.SystemUIDialog

import com.android.systemui.statusbar.phone.SystemUIDialog.DEFAULT_DISMISS_ON_DEVICE_LOCK

import com.android.systemui.statusbar.phone.SystemUIDialogManager
@@ -101,6 +102,7 @@ class FontScalingDialogDelegateTest : SysuiTestCase() { 
                    userTracker,

                    mainHandler,

                    backgroundDelayableExecutor,

                    FakeShadeDialogContextInteractor(mContext),

                )

            )

packages/SystemUI/src/com/android/systemui/accessibility/fontscaling/FontScalingDialogDelegate.kt

+6 −2
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ import com.android.systemui.dagger.qualifiers.Background 
import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.res.R

import com.android.systemui.settings.UserTracker

import com.android.systemui.shade.ShadeDisplayAware

import com.android.systemui.shade.domain.interactor.ShadeDialogContextInteractor

import com.android.systemui.statusbar.phone.SystemUIDialog

import com.android.systemui.util.concurrency.DelayableExecutor

import com.android.systemui.util.settings.SecureSettings
@@ -49,7 +51,7 @@ import kotlin.math.roundToInt 
class FontScalingDialogDelegate

@Inject

constructor(

    private val context: Context,

    @ShadeDisplayAware private val context: Context,

    private val systemUIDialogFactory: SystemUIDialog.Factory,

    private val layoutInflater: LayoutInflater,

    private val systemSettings: SystemSettings,
@@ -58,6 +60,7 @@ constructor( 
    private val userTracker: UserTracker,

    @Main mainHandler: Handler,

    @Background private val backgroundDelayableExecutor: DelayableExecutor,

    private val shadeDialogContextInteractor: ShadeDialogContextInteractor,

) : SystemUIDialog.Delegate {

    private val MIN_UPDATE_INTERVAL_MS: Long = 800

    private val CHANGE_BY_SEEKBAR_DELAY_MS: Long = 100
@@ -80,7 +83,8 @@ constructor( 
            }

        }



    override fun createDialog(): SystemUIDialog = systemUIDialogFactory.create(this)

    override fun createDialog(): SystemUIDialog =

        systemUIDialogFactory.create(this, shadeDialogContextInteractor.context)



    override fun beforeCreate(dialog: SystemUIDialog, savedInstanceState: Bundle?) {

        dialog.setTitle(R.string.font_scaling_dialog_title)