diff options
| author | 2020-07-24 19:31:59 +0000 | |
|---|---|---|
| committer | 2020-07-24 19:31:59 +0000 | |
| commit | ff2da0d09b626a85081a06c7819b23dea2d4edb1 (patch) | |
| tree | 2b680583af95f1e3f4b364b9ec30e8539ce9370c | |
| parent | 5f924b22183fccec4ecf08219b2a38397d07b93c (diff) | |
| parent | 764e7ac56cd37c5204e3141050883fc85a97e7ac (diff) | |
Merge "Animate out screenshot UI on back and CLOSE_SYSTEM_DIALOGS" into rvc-qpr-dev am: 764e7ac56c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12048482
Change-Id: I9b48a4c979f77933639d41f4bf6a109c1dfe1b24
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/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 e69319ee6829..c53523032353 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 6f143da5405a..a043f0f1e50c 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); } } }; |