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

Commit a2b2f222 authored by Matt Casey's avatar Matt Casey Committed by Android (Google) Code Review
Browse files

Merge "Manually apply "hide capture more" change to main" into main

parents 78c59e31 04efdc82

packages/SystemUI/src/com/android/systemui/screenshot/LegacyScreenshotController.java

+3 −1
Original line number Diff line number Diff line
@@ -313,7 +313,9 @@ public class LegacyScreenshotController implements InteractiveScreenshotHandler 
        setWindowFocusable(true);

        mViewProxy.requestFocus();



        if (screenshot.getType() != WindowManager.TAKE_SCREENSHOT_PROVIDED_IMAGE) {

            enqueueScrollCaptureRequest(requestId, screenshot.getUserHandle());

        }



        attachWindow();

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

+4 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.util.Log 
import android.view.Display

import android.view.ScrollCaptureResponse

import android.view.ViewRootImpl.ActivityConfigCallback

import android.view.WindowManager

import android.view.WindowManager.TAKE_SCREENSHOT_PROVIDED_IMAGE

import android.widget.Toast

import android.window.WindowContext
@@ -217,7 +218,9 @@ internal constructor( 
        window.setFocusable(true)

        viewProxy.requestFocus()



        if (screenshot.type != WindowManager.TAKE_SCREENSHOT_PROVIDED_IMAGE) {

            enqueueScrollCaptureRequest(requestId, screenshot.userHandle)

        }



        window.attachWindow()