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

Commit 30effa18 authored by Mark Renouf's avatar Mark Renouf Committed by Automerger Merge Worker
Browse files

Merge "Adds additional UiEvent logs for LongScreenshotActivity" into... 

Merge "Adds additional UiEvent logs for LongScreenshotActivity" into sc-qpr1-dev am: 0dca9ae5 am: 7011a290

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

Change-Id: I355f6c58eb8553c966d6c40976f2dac7b1cde3f9
parents c238154a 7011a290

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

+5 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ public class LongScreenshotActivity extends Activity { 
    @Override

    public void onStart() {

        super.onStart();

        mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_LONG_SCREENSHOT_ACTIVITY_STARTED);



        if (mPreview.getDrawable() != null) {

            // We already have an image, so no need to try to load again.
@@ -245,6 +246,8 @@ public class LongScreenshotActivity extends Activity { 
    }



    private void onCachedImageLoaded(ImageLoader.Result imageResult) {

        mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_LONG_SCREENSHOT_ACTIVITY_CACHED_IMAGE_LOADED);



        BitmapDrawable drawable = new BitmapDrawable(getResources(), imageResult.bitmap);

        mPreview.setImageDrawable(drawable);

        mPreview.setAlpha(1f);
@@ -282,6 +285,8 @@ public class LongScreenshotActivity extends Activity { 
            finish();

        }

        if (isFinishing()) {

            mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_LONG_SCREENSHOT_ACTIVITY_FINISHED);



            if (mScrollCaptureResponse != null) {

                mScrollCaptureResponse.close();

            }

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

+7 −1
Original line number Diff line number Diff line
@@ -77,7 +77,13 @@ public enum ScreenshotEvent implements UiEventLogger.UiEventEnum { 
    @UiEvent(doc = "The long screenshot capture failed")

    SCREENSHOT_LONG_SCREENSHOT_FAILURE(881),

    @UiEvent(doc = "The long screenshot capture completed successfully")

    SCREENSHOT_LONG_SCREENSHOT_COMPLETED(882);

    SCREENSHOT_LONG_SCREENSHOT_COMPLETED(882),

    @UiEvent(doc = "Long screenshot editor activity started")

    SCREENSHOT_LONG_SCREENSHOT_ACTIVITY_STARTED(889),

    @UiEvent(doc = "Long screenshot editor activity loaded a previously saved screenshot")

    SCREENSHOT_LONG_SCREENSHOT_ACTIVITY_CACHED_IMAGE_LOADED(890),

    @UiEvent(doc = "Long screenshot editor activity finished")

    SCREENSHOT_LONG_SCREENSHOT_ACTIVITY_FINISHED(891);



    private final int mId;