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

Commit d48f8dff authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Start screenshot timeout even if saving fails" into rvc-dev am:... 

Merge "Merge "Start screenshot timeout even if saving fails" into rvc-dev am: abbdec42 am: 463ea65a am: 73560bef" into rvc-qpr-dev-plus-aosp am: 131ae0a0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11742659

Change-Id: I1d3e95b5bbeedd57d02cd541436420ced4dfbe14
parents a892e3b2 131ae0a0

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

+12 −11
Original line number Diff line number Diff line
@@ -643,6 +643,18 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset 
     */

    private void showUiOnActionsReady(SavedImageData imageData) {

        logSuccessOnActionsReady(imageData);



        AccessibilityManager accessibilityManager = (AccessibilityManager)

                mContext.getSystemService(Context.ACCESSIBILITY_SERVICE);

        long timeoutMs = accessibilityManager.getRecommendedTimeoutMillis(

                SCREENSHOT_CORNER_DEFAULT_TIMEOUT_MILLIS,

                AccessibilityManager.FLAG_CONTENT_CONTROLS);



        mScreenshotHandler.removeMessages(MESSAGE_CORNER_TIMEOUT);

        mScreenshotHandler.sendMessageDelayed(

                mScreenshotHandler.obtainMessage(MESSAGE_CORNER_TIMEOUT),

                timeoutMs);



        if (imageData.uri != null) {

            mScreenshotHandler.post(() -> {

                if (mScreenshotAnimation != null && mScreenshotAnimation.isRunning()) {
@@ -656,17 +668,6 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset 
                } else {

                    createScreenshotActionsShadeAnimation(imageData).start();

                }



                AccessibilityManager accessibilityManager = (AccessibilityManager)

                        mContext.getSystemService(Context.ACCESSIBILITY_SERVICE);

                long timeoutMs = accessibilityManager.getRecommendedTimeoutMillis(

                        SCREENSHOT_CORNER_DEFAULT_TIMEOUT_MILLIS,

                        AccessibilityManager.FLAG_CONTENT_CONTROLS);



                mScreenshotHandler.removeMessages(MESSAGE_CORNER_TIMEOUT);

                mScreenshotHandler.sendMessageDelayed(

                        mScreenshotHandler.obtainMessage(MESSAGE_CORNER_TIMEOUT),

                        timeoutMs);

            });

        }

    }