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 am: 9d3554d50f

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

Change-Id: Ib62c1a48451d2576e73af479aa2807bba56a56a9
This commit is contained in:
Miranda Kephart
2020-08-26 15:18:41 +00:00
committed by Automerger Merge Worker
parent 0c6b6eaad7 9d3554d50f
commit d1162a9f05
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

@@ -573,7 +573,12 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
private void saveScreenshot(Bitmap screenshot, Consumer<Uri> finisher, Rect screenRect,
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;

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

@@ -59,7 +59,9 @@ public enum ScreenshotEvent implements UiEventLogger.UiEventEnum {
@UiEvent(doc = "screenshot interaction timed out")
SCREENSHOT_INTERACTION_TIMEOUT(310),
@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;