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

Commit 84149c98 authored by Diksha Gohlyan's avatar Diksha Gohlyan Committed by Automerger Merge Worker
Browse files

Merge "Add metrics for drag initiated from docsui" into rvc-dev am: be485583 

Change-Id: I576d092691f08d9cac29ad9666f5d131a7ed0805
parents 39b140cc be485583

src/com/android/documentsui/Metrics.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -341,6 +341,14 @@ public final class Metrics { 
                getSearchMode(isKeywordSearch, isChipsSearch));

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

    public static void logPickResult(PickResult result) {

        DocumentsStatsLog.write(

        DocumentsStatsLog.write(

                DocumentsStatsLog.DOCS_UI_PICK_RESULT_REPORTED,

                DocumentsStatsLog.DOCS_UI_PICK_RESULT_REPORTED,

src/com/android/documentsui/dirlist/DragHost.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.documentsui.AbstractActionHandler; 
import com.android.documentsui.AbstractDragHost;

import com.android.documentsui.AbstractDragHost;

import com.android.documentsui.ActionHandler;

import com.android.documentsui.ActionHandler;

import com.android.documentsui.DragAndDropManager;

import com.android.documentsui.DragAndDropManager;

import com.android.documentsui.Metrics;

import com.android.documentsui.R;

import com.android.documentsui.R;

import com.android.documentsui.base.DocumentInfo;

import com.android.documentsui.base.DocumentInfo;

import com.android.documentsui.base.DocumentStack;

import com.android.documentsui.base.DocumentStack;
@@ -110,7 +111,9 @@ class DragHost<T extends Activity & AbstractActionHandler.CommonAddons> extends 




    @Override

    @Override

    public boolean canHandleDragEvent(View v) {

    public boolean canHandleDragEvent(View v) {

        if (!mDragAndDropManager.isDragFromSameApp()) {

        boolean dragInitiatedFromDocsUI = mDragAndDropManager.isDragFromSameApp();

        Metrics.logDragInitiated(dragInitiatedFromDocsUI);

        if (!dragInitiatedFromDocsUI) {

            Snackbar.make(

            Snackbar.make(

                    v, R.string.drag_from_another_app, Snackbar.LENGTH_SHORT).show();

                    v, R.string.drag_from_another_app, Snackbar.LENGTH_SHORT).show();

            return false;

            return false;

tests/unit/com/android/documentsui/MetricsTest.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,6 @@ package com.android.documentsui; 
import android.content.Intent;

import android.content.Intent;

import android.net.Uri;

import android.net.Uri;





import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.runner.AndroidJUnit4;
@@ -36,4 +35,9 @@ public class MetricsTest { 
        state.action = State.ACTION_BROWSE;

        state.action = State.ACTION_BROWSE;

        Metrics.logActivityLaunch(state, intent);

        Metrics.logActivityLaunch(state, intent);

    }

    }



    @Test

    public void logDragInitiated_shouldNotCrash() {

        Metrics.logDragInitiated(true);

    }

}
 
}