From d7bd2554651e10ed65ab8a1969d75d53f7ae9f7c Mon Sep 17 00:00:00 2001 From: Matt Casey Date: Tue, 30 Jun 2020 13:55:22 -0400 Subject: [PATCH] Animate out screenshot UI on back and CLOSE_SYSTEM_DIALOGS Bug: 162036868 Bug: 160189912 Test: Screenshot, press back, observe animation. Change-Id: I0ab4d029315765cff76ee22a4556e0647b938e07 --- .../src/com/android/systemui/screenshot/GlobalScreenshot.java | 2 +- .../com/android/systemui/screenshot/TakeScreenshotService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java index e69319ee68295..c53523032353a 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java @@ -493,7 +493,7 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset }); mScreenshotLayout.setOnKeyListener((v, keyCode, event) -> { if (keyCode == KeyEvent.KEYCODE_BACK) { - dismissScreenshot("back pressed", true); + dismissScreenshot("back pressed", false); return true; } return false; diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java b/packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java index 6f143da5405a8..a043f0f1e50c5 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java @@ -61,7 +61,7 @@ public class TakeScreenshotService extends Service { @Override public void onReceive(Context context, Intent intent) { if (ACTION_CLOSE_SYSTEM_DIALOGS.equals(intent.getAction()) && mScreenshot != null) { - mScreenshot.dismissScreenshot("close system dialogs", true); + mScreenshot.dismissScreenshot("close system dialogs", false); } } };