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

Commit 743bc617 authored by Pierre Barbier de Reuille's avatar Pierre Barbier de Reuille
Browse files

Use DesktopExperienceFlags to call Flags.screenshotMultidisplayFocusChange 

This is a requirement to be able to use that feature as part of the 25Q3 developer option.

Fix: 413735060
Flag: EXEMPT (flag infra)
Test: Build and presubmits
Change-Id: Ib3a8a27770c410b35c5579a71f71de54b6c5665b
parent 0ec6b1d6

packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotExecutor.kt

+10 −2
Original line number Diff line number Diff line
@@ -22,10 +22,11 @@ import android.util.Log 
import android.view.Display

import android.view.WindowManager.ScreenshotSource

import android.view.WindowManager.TAKE_SCREENSHOT_PROVIDED_IMAGE

import android.window.DesktopExperienceFlags

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

import com.android.internal.logging.UiEventLogger

import com.android.internal.util.ScreenshotRequest

import com.android.systemui.Flags.screenshotMultidisplayFocusChange

import com.android.systemui.Flags

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.dagger.qualifiers.Background
@@ -105,7 +106,7 @@ constructor( 
        onSaved: (Uri?) -> Unit,

        requestCallback: RequestCallback,

    ) {

        if (screenshotMultidisplayFocusChange()) {

        if (SCREENSHOT_MULTIDISPLAY_FOCUS_CHANGE.isTrue) {

            val display = getDisplayToScreenshot(screenshotRequest)

            val screenshotHandler = getScreenshotController(display)

            dispatchToController(
@@ -341,5 +342,12 @@ constructor( 
                Display.TYPE_OVERLAY,

                Display.TYPE_WIFI,

            )



        val SCREENSHOT_MULTIDISPLAY_FOCUS_CHANGE =

            DesktopExperienceFlags.DesktopExperienceFlag(

                Flags::screenshotMultidisplayFocusChange,

                /* shouldOverrideByDevOption= */ true,

                Flags.FLAG_SCREENSHOT_MULTIDISPLAY_FOCUS_CHANGE,

            )

    }

}