Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1162a9f authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Add log for dismissal when new screenshot is taken" into rvc-qpr-dev... 

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

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

Change-Id: Ib62c1a48451d2576e73af479aa2807bba56a56a9
parents 0c6b6eaa 9d3554d5

packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -573,7 +573,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) {

        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);

            dismissScreenshot("new screenshot requested", true);

        }





        mScreenBitmap = screenshot;

        mScreenBitmap = screenshot;

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotEvent.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,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;