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

Commit aaefa713 authored by Nicolo' Mazzucato's avatar Nicolo' Mazzucato
Browse files

Reformat classes affected by recent QS refactor 

Doing this in a follow up cl as it was affecting readabiltiy of the original small changes.

Bug: 362719719
Bug: 383294128
Test: InternetDialogDelegateTest, UserSwitchDialogControllerTest, DataSaverTileTest
Flag: com.android.systemui.shade_window_goes_around
Change-Id: I43717d0736625100dc92984faf9e132e67f077c5
parent 0e8e4ebe

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/user/UserSwitchDialogControllerTest.kt

+20 −29
Original line number Diff line number Diff line
@@ -56,26 +56,16 @@ import org.mockito.kotlin.any 
@RunWith(AndroidJUnit4::class)

class UserSwitchDialogControllerTest : SysuiTestCase() {



    @Mock

    private lateinit var dialogFactory: SystemUIDialog.Factory

    @Mock

    private lateinit var dialog: SystemUIDialog

    @Mock

    private lateinit var falsingManager: FalsingManager

    @Mock

    private lateinit var activityStarter: ActivityStarter

    @Mock

    private lateinit var userDetailViewAdapter: UserDetailView.Adapter

    @Mock

    private lateinit var launchExpandable: Expandable

    @Mock

    private lateinit var neutralButton: Button

    @Mock

    private lateinit var mDialogTransitionAnimator: DialogTransitionAnimator

    @Mock

    private lateinit var uiEventLogger: UiEventLogger

    @Captor

    private lateinit var clickCaptor: ArgumentCaptor<DialogInterface.OnClickListener>

    @Mock private lateinit var dialogFactory: SystemUIDialog.Factory

    @Mock private lateinit var dialog: SystemUIDialog

    @Mock private lateinit var falsingManager: FalsingManager

    @Mock private lateinit var activityStarter: ActivityStarter

    @Mock private lateinit var userDetailViewAdapter: UserDetailView.Adapter

    @Mock private lateinit var launchExpandable: Expandable

    @Mock private lateinit var neutralButton: Button

    @Mock private lateinit var mDialogTransitionAnimator: DialogTransitionAnimator

    @Mock private lateinit var uiEventLogger: UiEventLogger

    @Captor private lateinit var clickCaptor: ArgumentCaptor<DialogInterface.OnClickListener>



    private lateinit var controller: UserSwitchDialogController
@@ -86,13 +76,14 @@ class UserSwitchDialogControllerTest : SysuiTestCase() { 
        whenever(dialog.context).thenReturn(mContext)

        whenever(dialogFactory.create(eq(mContext))).thenReturn(dialog)



        controller = UserSwitchDialogController(

        controller =

            UserSwitchDialogController(

                { userDetailViewAdapter },

                activityStarter,

                falsingManager,

                mDialogTransitionAnimator,

                uiEventLogger,

            dialogFactory

                dialogFactory,

            )

    }
@@ -150,7 +141,7 @@ class UserSwitchDialogControllerTest : SysuiTestCase() { 
            .postStartActivityDismissingKeyguard(

                argThat(IntentMatcher(Settings.ACTION_USER_SETTINGS)),

                eq(0),

                eq(null)

                eq(null),

            )

        verify(uiEventLogger).log(QSUserSwitcherEvent.QS_USER_MORE_SETTINGS)

    }

packages/SystemUI/src/com/android/systemui/qs/tiles/impl/saver/domain/DataSaverDialogDelegate.kt

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.Context 
import android.content.DialogInterface

import android.content.SharedPreferences

import android.os.Bundle

import com.android.app.tracing.coroutines.launchTraced as launch

import com.android.internal.R

import com.android.systemui.coroutines.newTracingContext

import com.android.systemui.qs.tiles.impl.saver.domain.interactor.DataSaverTileUserActionInteractor
@@ -28,7 +29,6 @@ import com.android.systemui.statusbar.phone.SystemUIDialog 
import com.android.systemui.statusbar.policy.DataSaverController

import kotlin.coroutines.CoroutineContext

import kotlinx.coroutines.CoroutineScope

import com.android.app.tracing.coroutines.launchTraced as launch



class DataSaverDialogDelegate(

    private val sysuiDialogFactory: SystemUIDialog.Factory,

packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt

+30 −26
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.provider.Settings 
import android.view.LayoutInflater

import com.android.internal.jank.InteractionJankMonitor

import com.android.internal.logging.UiEventLogger

import com.android.systemui.res.R

import com.android.systemui.animation.DialogCuj

import com.android.systemui.animation.DialogTransitionAnimator

import com.android.systemui.animation.Expandable
@@ -34,22 +33,23 @@ import com.android.systemui.plugins.ActivityStarter 
import com.android.systemui.plugins.FalsingManager

import com.android.systemui.qs.QSUserSwitcherEvent

import com.android.systemui.qs.tiles.UserDetailView

import com.android.systemui.res.R

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

import com.android.systemui.user.ui.dialog.DialogShowerImpl

import javax.inject.Inject

import javax.inject.Provider



/**

 * Controller for [UserDialog].

 */

/** Controller for [UserDialog]. */

@SysUISingleton

class UserSwitchDialogController @Inject constructor(

class UserSwitchDialogController

@Inject

constructor(

    private val userDetailViewAdapterProvider: Provider<UserDetailView.Adapter>,

    private val activityStarter: ActivityStarter,

    private val falsingManager: FalsingManager,

    private val dialogTransitionAnimator: DialogTransitionAnimator,

    private val uiEventLogger: UiEventLogger,

    private val dialogFactory: SystemUIDialog.Factory

    private val dialogFactory: SystemUIDialog.Factory,

) {



    companion object {
@@ -72,10 +72,13 @@ class UserSwitchDialogController @Inject constructor( 
            setPositiveButton(R.string.quick_settings_done) { _, _ ->

                uiEventLogger.log(QSUserSwitcherEvent.QS_USER_DETAIL_CLOSE)

            }

            setNeutralButton(R.string.quick_settings_more_user_settings, { _, _ ->

            setNeutralButton(

                R.string.quick_settings_more_user_settings,

                { _, _ ->

                    if (!falsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) {

                        uiEventLogger.log(QSUserSwitcherEvent.QS_USER_MORE_SETTINGS)

                    val controller = dialogTransitionAnimator.createActivityTransitionController(

                        val controller =

                            dialogTransitionAnimator.createActivityTransitionController(

                                getButton(BUTTON_NEUTRAL)

                            )
@@ -84,12 +87,16 @@ class UserSwitchDialogController @Inject constructor( 
                        }



                        activityStarter.postStartActivityDismissingKeyguard(

                        USER_SETTINGS_INTENT, 0, controller

                            USER_SETTINGS_INTENT,

                            0,

                            controller,

                        )

                    }

            }, false /* dismissOnClick */)

            val gridFrame = LayoutInflater.from(this.context)

                .inflate(R.layout.qs_user_dialog_content, null)

                },

                false, /* dismissOnClick */

            )

            val gridFrame =

                LayoutInflater.from(this.context).inflate(R.layout.qs_user_dialog_content, null)

            setView(gridFrame)



            val adapter = userDetailViewAdapterProvider.get()
@@ -101,10 +108,7 @@ class UserSwitchDialogController @Inject constructor( 
                    DialogCuj(InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN, INTERACTION_JANK_TAG)

                )

            if (controller != null) {

                dialogTransitionAnimator.show(

                    this,

                    controller,

                )

                dialogTransitionAnimator.show(this, controller)

            } else {

                show()

            }