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

Merge "Add log for dismissal when new screenshot is taken" into rvc-qpr-dev am: 61ac80b352

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

Change-Id: Ifc46807c0f9ca1ce48c88853357d728705edc04c
This commit is contained in:
Miranda Kephart
2020-08-26 14:46:33 +00:00
committed by Automerger Merge Worker
parent 35b0a4ae6c 61ac80b352
commit 9d3554d50f
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -565,7 +565,12 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
private void saveScreenshot(Bitmap screenshot, Consumer<Uri> finisher, Rect screenRect, private void saveScreenshot(Bitmap screenshot, Consumer<Uri> finisher, Rect screenRect,
Insets screenInsets, boolean showFlash) { Insets screenInsets, boolean showFlash) {
dismissScreenshot("new screenshot requested", true); if (mScreenshotLayout.isAttachedToWindow()) {
if (!mDismissAnimation.isRunning()) { // if we didn't already dismiss for another reason
mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_REENTERED);
}
dismissScreenshot("new screenshot requested", true);
}
mScreenBitmap = screenshot; mScreenBitmap = screenshot;

4
packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotEvent.java
View File

@@ -56,7 +56,9 @@ public enum ScreenshotEvent implements UiEventLogger.UiEventEnum {
@UiEvent(doc = "screenshot interaction timed out") @UiEvent(doc = "screenshot interaction timed out")
SCREENSHOT_INTERACTION_TIMEOUT(310), SCREENSHOT_INTERACTION_TIMEOUT(310),
@UiEvent(doc = "screenshot explicitly dismissed") @UiEvent(doc = "screenshot explicitly dismissed")
SCREENSHOT_EXPLICIT_DISMISSAL(311); SCREENSHOT_EXPLICIT_DISMISSAL(311),
@UiEvent(doc = "screenshot reentered for new screenshot")
SCREENSHOT_REENTERED(640);
private final int mId; private final int mId;