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

Commit bc609b5c authored by Aga Wronska's avatar Aga Wronska
Browse files

resolve merge conflicts of 9d5aadd to nyc-andromeda-dev 

Change-Id: I3beb9bc8623f30a591984eb10b1843f4bf8a8cac
parents 086283be ad03d98f

src/com/android/documentsui/Metrics.java

+21 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ public final class Metrics { 
    private static final String COUNT_FILEOP_CANCELED = "docsui_fileop_canceled";

    private static final String COUNT_STARTUP_MS = "docsui_startup_ms";

    private static final String COUNT_DRAWER_OPENED = "docsui_drawer_opened";

    private static final String COUNT_DRAG_N_DROP = "docsui_drag_n_drop";

    private static final String COUNT_SEARCH = "docsui_search";



    // Indices for bucketing roots in the roots histogram. "Other" is the catch-all index for any

    // root that is not explicitly recognized by the Metrics code (see {@link
@@ -448,6 +450,25 @@ public final class Metrics { 
        logHistogram(context, COUNT_STARTUP_MS, startupMs);

    }



    /**

     * Logs a drag and drop action. Call this when the user drops the content triggering copy.

     * operation.

     *

     * @param context

     */

    public static void logDragNDrop(Context context) {

        logCount(context, COUNT_DRAG_N_DROP);

    }



    /**

     * Logs a search. Call this when the search operation is finished.

     *

     * @param context

     */

    public static void logSearch(Context context) {

        logCount(context, COUNT_SEARCH);

    }



    private static void logInterProviderFileOps(

            Context context,

            String histogram,

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

+5 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ import com.android.documentsui.Events; 
import com.android.documentsui.Events.MotionInputEvent;

import com.android.documentsui.Menus;

import com.android.documentsui.MessageBar;

import com.android.documentsui.Metrics;

import com.android.documentsui.MimePredicate;

import com.android.documentsui.R;

import com.android.documentsui.RecentsLoader;
@@ -1125,6 +1126,7 @@ public class DirectoryFragment extends Fragment 
                    if (Objects.equals(src, dst)) {

                        return false;

                    }

                    Metrics.logDragNDrop(getContext());

                    copyFromClipData(event.getClipData(), dst);

                    return true;

            }
@@ -1623,6 +1625,9 @@ public class DirectoryFragment extends Fragment 
    @Override

    public void onLoadFinished(Loader<DirectoryResult> loader, DirectoryResult result) {

        if (!isAdded()) return;

        if (mSearchMode) {

            Metrics.logSearch(getContext());

        }



        State state = getDisplayState();