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

Merge "Add logging for long screenshots" into sc-dev

Browse Source
This commit is contained in:
Matt Casey
2021-02-01 21:20:42 +00:00
committed by Android (Google) Code Review
parent e352e1f919 e8bd9217ed
commit 0da9a43002
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
View File

@@ -602,7 +602,7 @@ public class ScreenshotController {
private void runScrollCapture(ScrollCaptureClient.Connection connection) { private void runScrollCapture(ScrollCaptureClient.Connection connection) {
cancelTimeout(); cancelTimeout();
ScrollCaptureController controller = new ScrollCaptureController(mContext, connection, ScrollCaptureController controller = new ScrollCaptureController(mContext, connection,
mMainExecutor, mBgExecutor, mImageExporter); mMainExecutor, mBgExecutor, mImageExporter, mUiEventLogger);
controller.attach(mWindow); controller.attach(mWindow);
controller.start(new TakeScreenshotService.RequestCallback() { controller.start(new TakeScreenshotService.RequestCallback() {
@Override @Override

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

@@ -63,7 +63,15 @@ public enum ScreenshotEvent implements UiEventLogger.UiEventEnum {
@UiEvent(doc = "screenshot swiped to dismiss") @UiEvent(doc = "screenshot swiped to dismiss")
SCREENSHOT_SWIPE_DISMISSED(656), SCREENSHOT_SWIPE_DISMISSED(656),
@UiEvent(doc = "screenshot reentered for new screenshot") @UiEvent(doc = "screenshot reentered for new screenshot")
SCREENSHOT_REENTERED(640); SCREENSHOT_REENTERED(640),
@UiEvent(doc = "Long screenshot button was shown to the user")
SCREENSHOT_LONG_SCREENSHOT_IMPRESSION(687),
@UiEvent(doc = "User has requested a long screenshot")
SCREENSHOT_LONG_SCREENSHOT_REQUESTED(688),
@UiEvent(doc = "User has shared a long screenshot")
SCREENSHOT_LONG_SCREENSHOT_SHARE(689),
@UiEvent(doc = "User has sent a long screenshot to the editor")
SCREENSHOT_LONG_SCREENSHOT_EDIT(690);
private final int mId; private final int mId;

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

@@ -192,14 +192,14 @@ public class ScreenshotView extends FrameLayout implements
if (DEBUG_SCROLL) { if (DEBUG_SCROLL) {
Log.d(TAG, "Showing Scroll option"); Log.d(TAG, "Showing Scroll option");
} }
mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_LONG_SCREENSHOT_IMPRESSION);
mScrollChip.setVisibility(VISIBLE); mScrollChip.setVisibility(VISIBLE);
mScrollChip.setOnClickListener((v) -> { mScrollChip.setOnClickListener((v) -> {
if (DEBUG_INPUT) { if (DEBUG_INPUT) {
Log.d(TAG, "scroll chip tapped"); Log.d(TAG, "scroll chip tapped");
} }
mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_LONG_SCREENSHOT_REQUESTED);
onClick.run(); onClick.run();
// TODO Logging, store event consumer to a field
//onElementTapped.accept(ScreenshotEvent.SCREENSHOT_SCROLL_TAPPED);
}); });
} }

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

@@ -29,6 +29,7 @@ import android.view.ViewTreeObserver.OnComputeInternalInsetsListener;
import android.view.Window; import android.view.Window;
import android.widget.ImageView; import android.widget.ImageView;
import com.android.internal.logging.UiEventLogger;
import com.android.systemui.R; import com.android.systemui.R;
import com.android.systemui.screenshot.ScrollCaptureClient.Connection; import com.android.systemui.screenshot.ScrollCaptureClient.Connection;
import com.android.systemui.screenshot.ScrollCaptureClient.Session; import com.android.systemui.screenshot.ScrollCaptureClient.Session;
@@ -58,6 +59,7 @@ public class ScrollCaptureController implements OnComputeInternalInsetsListener
private final Executor mBgExecutor; private final Executor mBgExecutor;
private final ImageExporter mImageExporter; private final ImageExporter mImageExporter;
private final ImageTileSet mImageTileSet; private final ImageTileSet mImageTileSet;
private final UiEventLogger mUiEventLogger;
private ZonedDateTime mCaptureTime; private ZonedDateTime mCaptureTime;
private UUID mRequestId; private UUID mRequestId;
@@ -72,12 +74,13 @@ public class ScrollCaptureController implements OnComputeInternalInsetsListener
private Runnable mPendingAction; private Runnable mPendingAction;
public ScrollCaptureController(Context context, Connection connection, Executor uiExecutor, public ScrollCaptureController(Context context, Connection connection, Executor uiExecutor,
Executor bgExecutor, ImageExporter exporter) { Executor bgExecutor, ImageExporter exporter, UiEventLogger uiEventLogger) {
mContext = context; mContext = context;
mConnection = connection; mConnection = connection;
mUiExecutor = uiExecutor; mUiExecutor = uiExecutor;
mBgExecutor = bgExecutor; mBgExecutor = bgExecutor;
mImageExporter = exporter; mImageExporter = exporter;
mUiEventLogger = uiEventLogger;
mImageTileSet = new ImageTileSet(); mImageTileSet = new ImageTileSet();
} }
@@ -136,10 +139,12 @@ public class ScrollCaptureController implements OnComputeInternalInsetsListener
disableButtons(); disableButtons();
finish(); finish();
} else if (id == R.id.edit) { } else if (id == R.id.edit) {
mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_LONG_SCREENSHOT_EDIT);
v.setPressed(true); v.setPressed(true);
disableButtons(); disableButtons();
edit(); edit();
} else if (id == R.id.share) { } else if (id == R.id.share) {
mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_LONG_SCREENSHOT_SHARE);
v.setPressed(true); v.setPressed(true);
disableButtons(); disableButtons();
share(); share();