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

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

Merge "Guard large screen capture UI behind large_screen_recording flag" into main

parents 821a4e1a 57fc5f17

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/interactor/ScreenRecordTileUserActionInteractorTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ class ScreenRecordTileUserActionInteractorTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_LARGE_SCREEN_SCREENCAPTURE)

    @EnableFlags(Flags.FLAG_LARGE_SCREEN_SCREENCAPTURE, Flags.FLAG_LARGE_SCREEN_RECORDING)

    @DisableFlags(Flags.FLAG_NEW_SCREEN_RECORD_TOOLBAR)

    fun handleClick_withLargeScreenCaptureFlagEnabled_doesNotOpenDialog() = runTest {

        val recordingModel = ScreenRecordModel.DoingNothing

packages/SystemUI/src/com/android/systemui/screencapture/record/domain/interactor/ScreenCaptureRecordFeaturesInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ object ScreenCaptureRecordFeaturesInteractor { 
        get() = Flags.newScreenRecordToolbar()



    val isLargeScreenScreencaptureEnabled: Boolean

        get() = Flags.largeScreenScreencapture()

        get() = Flags.largeScreenScreencapture() && Flags.largeScreenRecording()



    val shouldShowNewToolbar: Boolean

        get() = isNewScreenRecordToolbarEnabled || isLargeScreenScreencaptureEnabled