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

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

Merge "update metrics constants"

parents 88022af3 f6b9fe55

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

+17 −1
Original line number Diff line number Diff line
@@ -32,9 +32,16 @@ public interface MetricsConstants { 
    public static final int ACCOUNTS_ACCOUNT_SYNC = 9;

    public static final int ACCOUNTS_CHOOSE_ACCOUNT_ACTIVITY = 10;

    public static final int ACCOUNTS_MANAGE_ACCOUNTS = 11;

    public static final int ACTION_WIFI_ADD_NETWORK = 134;

    public static final int ACTION_WIFI_CONNECT = 135;

    public static final int ACTION_WIFI_FORCE_SCAN = 136;

    public static final int ACTION_WIFI_FORGET = 137;

    public static final int ACTION_WIFI_OFF = 138;

    public static final int ACTION_WIFI_ON = 139;

    public static final int APN = 12;

    public static final int APN_EDITOR = 13;

    public static final int APPLICATION = 16;

    public static final int APPLICATIONS_ADVANCED = 130;

    public static final int APPLICATIONS_APP_LAUNCH = 17;

    public static final int APPLICATIONS_APP_PERMISSION = 18;

    public static final int APPLICATIONS_APP_STORAGE = 19;
@@ -85,8 +92,13 @@ public interface MetricsConstants { 
    public static final int INPUTMETHOD_USER_DICTIONARY_ADD_WORD = 62;

    public static final int LOCATION = 63;

    public static final int LOCATION_MODE = 64;

    public static final int LOCATION_SCANNING = 131;

    public static final int MAIN_SETTINGS = 1;

    public static final int MANAGE_APPLICATIONS = 65;

    public static final int MANAGE_APPLICATIONS_ALL = 132;

    public static final int MANAGE_APPLICATIONS_NOTIFICATIONS = 133;

    public static final int MANAGE_DOMAIN_URLS = 143;

    public static final int MANAGE_PERMISSIONS = 140;

    public static final int MASTER_CLEAR = 66;

    public static final int MASTER_CLEAR_CONFIRM = 67;

    public static final int NET_DATA_USAGE_METERED = 68;
@@ -94,10 +106,15 @@ public interface MetricsConstants { 
    public static final int NFC_PAYMENT = 70;

    public static final int NOTIFICATION = 71;

    public static final int NOTIFICATION_APP_NOTIFICATION = 72;

    public static final int NOTIFICATION_ITEM = 128;

    public static final int NOTIFICATION_ITEM_ACTION = 129;

    public static final int NOTIFICATION_OTHER_SOUND = 73;

    public static final int NOTIFICATION_PANEL = 127;

    public static final int NOTIFICATION_REDACTION = 74;

    public static final int NOTIFICATION_STATION = 75;

    public static final int NOTIFICATION_ZEN_MODE = 76;

    public static final int NOTIFICATION_ZEN_MODE_AUTOMATION = 142;

    public static final int NOTIFICATION_ZEN_MODE_PRIORITY = 141;

    public static final int OWNER_INFO = 77;

    public static final int PRINT_JOB_SETTINGS = 78;

    public static final int PRINT_SERVICE_SETTINGS = 79;
@@ -132,7 +149,6 @@ public interface MetricsConstants { 
    public static final int TRUST_AGENT = 91;

    public static final int TTS_ENGINE_SETTINGS = 93;

    public static final int TTS_TEXT_TO_SPEECH = 94;

    public static final int TYPE_UNKNOWN = 0;

    public static final int USAGE_ACCESS = 95;

    public static final int USER = 96;

    public static final int USERS_APP_RESTRICTIONS = 97;

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

+1 −17
Original line number Diff line number Diff line
@@ -26,23 +26,7 @@ import android.os.Build; 
 */

public class MetricsLogger implements MetricsConstants {

    // These constants are temporary, they should migrate to MetricsConstants.

    public static final int APPLICATIONS_ADVANCED = 132;

    public static final int LOCATION_SCANNING = 133;

    public static final int MANAGE_APPLICATIONS_ALL = 134;

    public static final int MANAGE_APPLICATIONS_NOTIFICATIONS = 135;



    public static final int ACTION_WIFI_ADD_NETWORK = 136;

    public static final int ACTION_WIFI_CONNECT = 137;

    public static final int ACTION_WIFI_FORCE_SCAN = 138;

    public static final int ACTION_WIFI_FORGET = 139;

    public static final int ACTION_WIFI_OFF = 140;

    public static final int ACTION_WIFI_ON = 141;



    public static final int MANAGE_PERMISSIONS = 142;

    public static final int NOTIFICATION_ZEN_MODE_PRIORITY = 143;

    public static final int NOTIFICATION_ZEN_MODE_AUTOMATION = 144;



    public static final int MANAGE_DOMAIN_URLS = 143;

    // next value is 144;



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

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