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

Commit 4502bfb8 authored by Chris Wren's avatar Chris Wren Committed by Android (Google) Code Review
Browse files

Merge "add new enums to MetricsConstans" into mnc-dev

parents 59b1dfef 05aa88a9

core/java/com/android/internal/logging/MetricsConstants.java

+24 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ package com.android.internal.logging; 
 */

public interface MetricsConstants {

    // These constants must match those in the analytic pipeline, do not edit.

    // Add temporary values to the top of MetricsLogger instead.

    public static final int VIEW_UNKNOWN = 0;

    public static final int MAIN_SETTINGS = 1;

    public static final int ACCESSIBILITY = 2;
@@ -82,7 +83,6 @@ public interface MetricsConstants { 
    public static final int INPUTMETHOD_LANGUAGE = 57;

    public static final int INPUTMETHOD_KEYBOARD = 58;

    public static final int INPUTMETHOD_SPELL_CHECKERS = 59;

    public static final int INPUTMETHOD_SUBTYPE_ENABLER = 60;

    public static final int INPUTMETHOD_USER_DICTIONARY = 61;

    public static final int INPUTMETHOD_USER_DICTIONARY_ADD_WORD = 62;

    public static final int LOCATION = 63;
@@ -229,6 +229,29 @@ public interface MetricsConstants { 
    public static final int ACTION_NOTE_CONTROLS = 204;

    public static final int ACTION_NOTE_INFO = 205;

    public static final int ACTION_APP_NOTE_SETTINGS = 206;

    public static final int VOLUME_DIALOG = 207;

    public static final int VOLUME_DIALOG_DETAILS = 208;

    public static final int ACTION_VOLUME_SLIDER = 209;

    public static final int ACTION_VOLUME_STREAM = 210;

    public static final int ACTION_VOLUME_KEY = 211;

    public static final int ACTION_VOLUME_ICON = 212;

    public static final int ACTION_RINGER_MODE = 213;

    public static final int ACTION_ACTIVITY_CHOOSER_SHOWN = 214;

    public static final int ACTION_ACTIVITY_CHOOSER_PICKED_APP_TARGET = 215;

    public static final int ACTION_ACTIVITY_CHOOSER_PICKED_SERVICE_TARGET = 216;

    public static final int ACTION_ACTIVITY_CHOOSER_PICKED_STANDARD_TARGET = 217;

    public static final int ACTION_BRIGHTNESS = 218;

    public static final int ACTION_BRIGHTNESS_AUTO = 219;

    public static final int BRIGHTNESS_DIALOG = 220;

    public static final int SYSTEM_ALERT_WINDOW_APPS = 221;

    public static final int DREAMING = 222;

    public static final int DOZING = 223;

    public static final int OVERVIEW_ACTIVITY = 224;

    public static final int ABOUT_LEGAL_SETTINGS = 225;

    public static final int ACTION_SEARCH_RESULTS = 226;



    // These constants must match those in the analytic pipeline, do not edit.

    // Add temporary values to the top of MetricsLogger instead.



    //aliases

    public static final int DEVICEINFO_STORAGE = DEVICEINFO_MEMORY;

core/java/com/android/internal/logging/MetricsLogger.java

+1 −18
Original line number Diff line number Diff line
@@ -26,25 +26,8 @@ import android.view.View; 
 * @hide

 */

public class MetricsLogger implements MetricsConstants {

    public static final int VOLUME_DIALOG = 207;

    public static final int VOLUME_DIALOG_DETAILS = 208;

    public static final int ACTION_VOLUME_SLIDER = 209;

    public static final int ACTION_VOLUME_STREAM = 210;

    public static final int ACTION_VOLUME_KEY = 211;

    public static final int ACTION_VOLUME_ICON = 212;

    public static final int ACTION_RINGER_MODE = 213;

    public static final int ACTION_ACTIVITY_CHOOSER_SHOWN = 214;

    public static final int ACTION_ACTIVITY_CHOOSER_PICKED_APP_TARGET = 215;

    public static final int ACTION_ACTIVITY_CHOOSER_PICKED_SERVICE_TARGET = 216;

    public static final int ACTION_ACTIVITY_CHOOSER_PICKED_STANDARD_TARGET = 217;

    public static final int ACTION_BRIGHTNESS = 218;

    public static final int ACTION_BRIGHTNESS_AUTO = 219;

    public static final int BRIGHTNESS_DIALOG = 220;

    public static final int SYSTEM_ALERT_WINDOW_APPS = 221;

    public static final int DREAMING = 222;

    public static final int DOZING = 223;

    public static final int OVERVIEW_ACTIVITY = 224;

    // Temporary constants go here, to await migration to MetricsConstants.

    // next value is 227;



    public static void visible(Context context, int category) throws IllegalArgumentException {

        if (Build.IS_DEBUGGABLE && category == VIEW_UNKNOWN) {