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

Commit de15ef1e authored by Wes Okuhara's avatar Wes Okuhara Committed by Android (Google) Code Review
Browse files

Merge "Desktop screenshots: Rename app window feature flag" into main

parents cc8e7ee4 47784cea

packages/SystemUI/aconfig/systemui.aconfig

+2 −2
Original line number Diff line number Diff line
@@ -1952,9 +1952,9 @@ flag { 
}



flag {

    name: "desktop_screen_capture_app_window"

    name: "large_screen_screenshot_app_window"

    namespace: "systemui"

    description: "Enables the app window region option for desktop screen capture."

    description: "Enables the app window region screenshot option on large screen devices."

    bug: "422833825"

}

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

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import javax.inject.Inject 


@SysUISingleton

class ScreenCaptureRecordLargeScreenFeaturesInteractor @Inject constructor() {

    val appWindowRegionSupported = Flags.desktopScreenCaptureAppWindow()

    val appWindowRegionSupported = Flags.largeScreenScreenshotAppWindow()



    val screenRecordingSupported = Flags.largeScreenRecording()

}

packages/SystemUI/tests/src/com/android/systemui/screencapture/record/largescreen/ui/viewmodel/PreCaptureViewModelTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ class PreCaptureViewModelTest : SysuiTestCase() { 
        }



    @Test

    @EnableFlags(Flags.FLAG_DESKTOP_SCREEN_CAPTURE_APP_WINDOW)

    @EnableFlags(Flags.FLAG_LARGE_SCREEN_SCREENSHOT_APP_WINDOW)

    fun updateCaptureRegion_updatesSelectedCaptureRegionButtonViewModel() =

        testScope.runTest {

            // Default region is fullscreen
@@ -176,7 +176,7 @@ class PreCaptureViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(Flags.FLAG_DESKTOP_SCREEN_CAPTURE_APP_WINDOW)

    @DisableFlags(Flags.FLAG_LARGE_SCREEN_SCREENSHOT_APP_WINDOW)

    fun captureRegionButtonViewModels_excludesAppWindowWithFeatureDisabled() =

        testScope.runTest {

            // TODO(b/430364500) Once a11y label is available, use it for a more robust assertion.
@@ -185,7 +185,7 @@ class PreCaptureViewModelTest : SysuiTestCase() { 
        }



    @Test

    @EnableFlags(Flags.FLAG_DESKTOP_SCREEN_CAPTURE_APP_WINDOW)

    @EnableFlags(Flags.FLAG_LARGE_SCREEN_SCREENSHOT_APP_WINDOW)

    fun captureRegionButtonViewModels_includesAppWindowWithFeatureEnabled() =

        testScope.runTest {

            // TODO(b/430364500) Once a11y label is available, use it for a more robust assertion.