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

Commit f01601f5 authored by Miranda Kephart's avatar Miranda Kephart
Browse files

Start screenshot timeout even if saving fails 

Currently we only start the timeout if the saving task completes
successfully. This means that if it fails, the preview hangs around
indefinitely (though it's still dismissable via the x button).

This change moves the timeout code so that the timer is started when
we get a response from the saving task, regardless of whether it
succeeded or failed.

Bug: 158225178
Fix: 158225178
Test: manual
Change-Id: Ica15a12e3f9abf49d8d7d12d3947d2bfb8d61252
parent 38e3d616

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);

            });

        }

    }