summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Diksha Gohlyan <dikshag@google.com> 2020-04-28 16:14:50 -0700
committer Diksha Gohlyan <dikshag@google.com> 2020-04-30 08:24:43 -0700
commitbe90f5fb91c82afc121de2ee03c794c52426bea4 (patch)
treec5823779eafed9d9770cb15bb7def32afa0be8c4
parentca093e4abd49adc0cf06a94f7b38bf30b1f05b4c (diff)
Add metrics for drag initiated from docsui
Test: atest MetricsTest Bug: 155134389 Change-Id: I1ec03976b2a9c936f68f0544ababf04c7f571f57
-rw-r--r--src/com/android/documentsui/Metrics.java8
-rw-r--r--src/com/android/documentsui/dirlist/DragHost.java5
-rw-r--r--tests/unit/com/android/documentsui/MetricsTest.java6
3 files changed, 17 insertions, 2 deletions
diff --git a/src/com/android/documentsui/Metrics.java b/src/com/android/documentsui/Metrics.java
index 90f2b6ff7..303add371 100644
--- a/src/com/android/documentsui/Metrics.java
+++ b/src/com/android/documentsui/Metrics.java
@@ -341,6 +341,14 @@ public final class Metrics {
getSearchMode(isKeywordSearch, isChipsSearch));
}
+ /**
+ * Logs drag initiated from which app, documentsUI or another app.
+ */
+ public static void logDragInitiated(boolean isDragInitatedFromDocsUI) {
+ DocumentsStatsLog.write(DocumentsStatsLog.DOCS_UI_DRAG_AND_DROP_REPORTED,
+ isDragInitatedFromDocsUI);
+ }
+
public static void logPickResult(PickResult result) {
DocumentsStatsLog.write(
DocumentsStatsLog.DOCS_UI_PICK_RESULT_REPORTED,
diff --git a/src/com/android/documentsui/dirlist/DragHost.java b/src/com/android/documentsui/dirlist/DragHost.java
index 0222ecb3e..1d9a20451 100644
--- a/src/com/android/documentsui/dirlist/DragHost.java
+++ b/src/com/android/documentsui/dirlist/DragHost.java
@@ -30,6 +30,7 @@ import com.android.documentsui.AbstractActionHandler;
import com.android.documentsui.AbstractDragHost;
import com.android.documentsui.ActionHandler;
import com.android.documentsui.DragAndDropManager;
+import com.android.documentsui.Metrics;
import com.android.documentsui.R;
import com.android.documentsui.base.DocumentInfo;
import com.android.documentsui.base.DocumentStack;
@@ -110,7 +111,9 @@ class DragHost<T extends Activity & AbstractActionHandler.CommonAddons> extends
@Override
public boolean canHandleDragEvent(View v) {
- if (!mDragAndDropManager.isDragFromSameApp()) {
+ boolean dragInitiatedFromDocsUI = mDragAndDropManager.isDragFromSameApp();
+ Metrics.logDragInitiated(dragInitiatedFromDocsUI);
+ if (!dragInitiatedFromDocsUI) {
Snackbar.make(
v, R.string.drag_from_another_app, Snackbar.LENGTH_SHORT).show();
return false;
diff --git a/tests/unit/com/android/documentsui/MetricsTest.java b/tests/unit/com/android/documentsui/MetricsTest.java
index cdf67a96a..abb130656 100644
--- a/tests/unit/com/android/documentsui/MetricsTest.java
+++ b/tests/unit/com/android/documentsui/MetricsTest.java
@@ -3,7 +3,6 @@ package com.android.documentsui;
import android.content.Intent;
import android.net.Uri;
-import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
@@ -36,4 +35,9 @@ public class MetricsTest {
state.action = State.ACTION_BROWSE;
Metrics.logActivityLaunch(state, intent);
}
+
+ @Test
+ public void logDragInitiated_shouldNotCrash() {
+ Metrics.logDragInitiated(true);
+ }
}