Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Start screenshot timeout even if saving fails" into rvc-dev am: abbdec4281 am: 187c2f86b8

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

Change-Id: I3a17ee088651869cb2bc2f657a72ae257996099c
This commit is contained in:
Miranda Kephart
2020-06-05 16:28:28 +00:00
committed by Automerger Merge Worker
parent af0aee051d 187c2f86b8
commit e8ddc4ab40
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
View File

@@ -643,6 +643,18 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
*/ */
private void showUiOnActionsReady(SavedImageData imageData) { private void showUiOnActionsReady(SavedImageData imageData) {
logSuccessOnActionsReady(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) { if (imageData.uri != null) {
mScreenshotHandler.post(() -> { mScreenshotHandler.post(() -> {
if (mScreenshotAnimation != null && mScreenshotAnimation.isRunning()) { if (mScreenshotAnimation != null && mScreenshotAnimation.isRunning()) {
@@ -656,17 +668,6 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
} else { } else {
createScreenshotActionsShadeAnimation(imageData).start(); 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);
}); });
} }
} }