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

Commit 10a96cdf authored by Anton Potapov's avatar Anton Potapov Committed by Android (Google) Code Review
Browse files

Merge "Rework starting settings activity from Volume Panel bottom bar." into main

parents 5cdd221f a80495d9

packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/bottombar/ui/viewmodel/BottomBarViewModelTest.kt

+11 −2
Original line number Diff line number Diff line
@@ -84,8 +84,17 @@ class BottomBarViewModelTest : SysuiTestCase() { 


                runCurrent()



                verify(activityStarter).startActivity(capture(intentCaptor), eq(true),

                        capture(activityStartedCaptor))

                verify(activityStarter)

                    .startActivityDismissingKeyguard(

                        /* intent = */ capture(intentCaptor),

                        /* onlyProvisioned = */ eq(false),

                        /* dismissShade = */ eq(true),

                        /* disallowEnterPictureInPictureWhileLaunching = */ eq(false),

                        /* callback = */ capture(activityStartedCaptor),

                        /* flags = */ eq(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT),

                        /* animationController = */ eq(null),

                        /* userHandle = */ eq(null),

                    )

                assertThat(intentCaptor.value.action).isEqualTo(Settings.ACTION_SOUND_SETTINGS)



                activityStartedCaptor.value.onActivityStarted(ActivityManager.START_SUCCESS)

packages/SystemUI/src/com/android/systemui/volume/panel/component/bottombar/ui/viewmodel/BottomBarViewModel.kt

+10 −5
Original line number Diff line number Diff line
@@ -36,10 +36,15 @@ constructor( 
    }



    fun onSettingsClicked() {

        activityStarter.startActivity(

            Intent(Settings.ACTION_SOUND_SETTINGS)

                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT),

            true,

        ) { volumePanelViewModel.dismissPanel() }

        activityStarter.startActivityDismissingKeyguard(

            /* intent = */ Intent(Settings.ACTION_SOUND_SETTINGS),

            /* onlyProvisioned = */ false,

            /* dismissShade = */ true,

            /* disallowEnterPictureInPictureWhileLaunching = */ false,

            /* callback = */ { volumePanelViewModel.dismissPanel() },

            /* flags = */ Intent.FLAG_ACTIVITY_REORDER_TO_FRONT,

            /* animationController = */ null,

            /* userHandle = */ null,

        )

    }

}