diff options
| author | 2016-01-27 19:02:14 +0000 | |
|---|---|---|
| committer | 2016-01-27 19:02:14 +0000 | |
| commit | 37745c3839bb2db662d6f1146e35e082cb2e7ea2 (patch) | |
| tree | cd8ba99ecf2906804797066c47cf7e48399cc519 | |
| parent | 3ca3a3db5e6539818d8b4c1a633e45c0b78df96c (diff) | |
| parent | f6e9228b8a97603d3ceb8f0d61e8d87cf19bd21f (diff) | |
Merge "move framework metrics over to new proto"
42 files changed, 140 insertions, 445 deletions
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index b7b74000380f..27333915b2b6 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -66,6 +66,7 @@ import android.widget.BaseAdapter; import android.widget.ListView; import com.android.internal.R; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import java.util.ArrayList; import java.util.Collections; @@ -209,7 +210,7 @@ public class ChooserActivity extends ResolverActivity { super.onCreate(savedInstanceState, target, title, defaultTitleRes, initialIntents, null, false); - MetricsLogger.action(this, MetricsLogger.ACTION_ACTIVITY_CHOOSER_SHOWN); + MetricsLogger.action(this, MetricsEvent.ACTION_ACTIVITY_CHOOSER_SHOWN); } @Override @@ -349,14 +350,14 @@ public class ChooserActivity extends ResolverActivity { int value = which; switch (mChooserListAdapter.getPositionTargetType(which)) { case ChooserListAdapter.TARGET_CALLER: - cat = MetricsLogger.ACTION_ACTIVITY_CHOOSER_PICKED_APP_TARGET; + cat = MetricsEvent.ACTION_ACTIVITY_CHOOSER_PICKED_APP_TARGET; break; case ChooserListAdapter.TARGET_SERVICE: - cat = MetricsLogger.ACTION_ACTIVITY_CHOOSER_PICKED_SERVICE_TARGET; + cat = MetricsEvent.ACTION_ACTIVITY_CHOOSER_PICKED_SERVICE_TARGET; value -= mChooserListAdapter.getCallerTargetCount(); break; case ChooserListAdapter.TARGET_STANDARD: - cat = MetricsLogger.ACTION_ACTIVITY_CHOOSER_PICKED_STANDARD_TARGET; + cat = MetricsEvent.ACTION_ACTIVITY_CHOOSER_PICKED_STANDARD_TARGET; value -= mChooserListAdapter.getCallerTargetCount() + mChooserListAdapter.getServiceTargetCount(); break; diff --git a/core/java/com/android/internal/logging/MetricsConstants.java b/core/java/com/android/internal/logging/MetricsConstants.java deleted file mode 100644 index 522732d76eaa..000000000000 --- a/core/java/com/android/internal/logging/MetricsConstants.java +++ /dev/null @@ -1,352 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.internal.logging; - -/** - * Constants for mestrics logs. - * - * @hide - */ -public interface MetricsConstants { - // These constants must match those in the analytic pipeline, do not edit. - // define metric categories in frameworks/base/core/proto/src/metrics_constants.proto. - public static final int MAIN_SETTINGS = 1; - public static final int ACCESSIBILITY = 2; - public static final int ACCESSIBILITY_CAPTION_PROPERTIES = 3; - public static final int ACCESSIBILITY_SERVICE = 4; - public static final int ACCESSIBILITY_TOGGLE_DALTONIZER = 5; - public static final int ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE = 6; - public static final int ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION = 7; - public static final int ACCOUNT = 8; - 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 APN = 12; - public static final int APN_EDITOR = 13; - public static final int APP_OPS_DETAILS = 14; - public static final int APP_OPS_SUMMARY = 15; - public static final int APPLICATION = 16; - public static final int APPLICATIONS_APP_LAUNCH = 17; - public static final int APPLICATIONS_APP_PERMISSION = 18; - public static final int APPLICATIONS_APP_STORAGE = 19; - public static final int APPLICATIONS_INSTALLED_APP_DETAILS = 20; - public static final int APPLICATIONS_PROCESS_STATS_DETAIL = 21; - public static final int APPLICATIONS_PROCESS_STATS_MEM_DETAIL = 22; - public static final int APPLICATIONS_PROCESS_STATS_UI = 23; - public static final int BLUETOOTH = 24; - public static final int BLUETOOTH_DEVICE_PICKER = 25; - public static final int BLUETOOTH_DEVICE_PROFILES = 26; - public static final int CHOOSE_LOCK_GENERIC = 27; - public static final int CHOOSE_LOCK_PASSWORD = 28; - public static final int CHOOSE_LOCK_PATTERN = 29; - public static final int CONFIRM_LOCK_PASSWORD = 30; - public static final int CONFIRM_LOCK_PATTERN = 31; - public static final int CRYPT_KEEPER = 32; - public static final int CRYPT_KEEPER_CONFIRM = 33; - public static final int DASHBOARD_SEARCH_RESULTS = 34; - public static final int DASHBOARD_SUMMARY = 35; - public static final int DATA_USAGE = 36; - public static final int DATA_USAGE_SUMMARY = 37; - public static final int DATE_TIME = 38; - public static final int DEVELOPMENT = 39; - public static final int DEVICEINFO = 40; - public static final int DEVICEINFO_IMEI_INFORMATION = 41; - public static final int DEVICEINFO_STORAGE = 42; - public static final int DEVICEINFO_SIM_STATUS = 43; - public static final int DEVICEINFO_STATUS = 44; - public static final int DEVICEINFO_USB = 45; - public static final int DISPLAY = 46; - public static final int DREAM = 47; - public static final int ENCRYPTION = 48; - public static final int FINGERPRINT = 49; - public static final int FINGERPRINT_ENROLL = 50; - public static final int FUELGAUGE_BATTERY_HISTORY_DETAIL = 51; - public static final int FUELGAUGE_BATTERY_SAVER = 52; - public static final int FUELGAUGE_POWER_USAGE_DETAIL = 53; - public static final int FUELGAUGE_POWER_USAGE_SUMMARY = 54; - public static final int HOME = 55; - public static final int ICC_LOCK = 56; - 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; - public static final int LOCATION_MODE = 64; - public static final int MANAGE_APPLICATIONS = 65; - public static final int MASTER_CLEAR = 66; - public static final int MASTER_CLEAR_CONFIRM = 67; - public static final int NET_DATA_USAGE_METERED = 68; - public static final int NFC_BEAM = 69; - 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_OTHER_SOUND = 73; - 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 OWNER_INFO = 77; - public static final int PRINT_JOB_SETTINGS = 78; - public static final int PRINT_SERVICE_SETTINGS = 79; - public static final int PRINT_SETTINGS = 80; - public static final int PRIVACY = 81; - public static final int PROXY_SELECTOR = 82; - public static final int RESET_NETWORK = 83; - public static final int RESET_NETWORK_CONFIRM = 84; - public static final int RUNNING_SERVICE_DETAILS = 85; - public static final int SCREEN_PINNING = 86; - public static final int SECURITY = 87; - public static final int SIM = 88; - public static final int TESTING = 89; - public static final int TETHER = 90; - public static final int TRUST_AGENT = 91; - public static final int TRUSTED_CREDENTIALS = 92; - public static final int TTS_ENGINE_SETTINGS = 93; - public static final int TTS_TEXT_TO_SPEECH = 94; - public static final int USAGE_ACCESS = 95; - public static final int USER = 96; - public static final int USERS_APP_RESTRICTIONS = 97; - public static final int USER_DETAILS = 98; - public static final int VOICE_INPUT = 99; - public static final int VPN = 100; - public static final int WALLPAPER_TYPE = 101; - public static final int WFD_WIFI_DISPLAY = 102; - public static final int WIFI = 103; - public static final int WIFI_ADVANCED = 104; - public static final int WIFI_CALLING = 105; - public static final int WIFI_SAVED_ACCESS_POINTS = 106; - public static final int WIFI_APITEST = 107; - public static final int WIFI_INFO = 108; - public static final int WIFI_P2P = 109; - public static final int WIRELESS = 110; - public static final int QS_AIRPLANEMODE = 112; - public static final int QS_BLUETOOTH = 113; - public static final int QS_CAST = 114; - public static final int QS_CELLULAR = 115; - public static final int QS_COLORINVERSION = 116; - public static final int QS_DATAUSAGEDETAIL = 117; - public static final int QS_DND = 118; - public static final int QS_FLASHLIGHT = 119; - public static final int QS_HOTSPOT = 120; - public static final int QS_INTENT = 121; - public static final int QS_LOCATION = 122; - public static final int QS_ROTATIONLOCK = 123; - public static final int QS_USERDETAILITE = 124; - public static final int QS_USERDETAIL = 125; - public static final int QS_WIFI = 126; - public static final int NOTIFICATION_PANEL = 127; - public static final int NOTIFICATION_ITEM = 128; - public static final int NOTIFICATION_ITEM_ACTION = 129; - public static final int APPLICATIONS_ADVANCED = 130; - public static final int LOCATION_SCANNING = 131; - public static final int MANAGE_APPLICATIONS_ALL = 132; - public static final int MANAGE_APPLICATIONS_NOTIFICATIONS = 133; - 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 MANAGE_PERMISSIONS = 140; - public static final int NOTIFICATION_ZEN_MODE_PRIORITY = 141; - public static final int NOTIFICATION_ZEN_MODE_AUTOMATION = 142; - public static final int MANAGE_DOMAIN_URLS = 143; - public static final int NOTIFICATION_ZEN_MODE_SCHEDULE_RULE = 144; - public static final int NOTIFICATION_ZEN_MODE_EXTERNAL_RULE = 145; - public static final int NOTIFICATION_ZEN_MODE_EVENT_RULE = 146; - public static final int ACTION_BAN_APP_NOTES = 147; - public static final int ACTION_DISMISS_ALL_NOTES = 148; - public static final int QS_DND_DETAILS = 149; - public static final int QS_BLUETOOTH_DETAILS = 150; - public static final int QS_CAST_DETAILS = 151; - public static final int QS_WIFI_DETAILS = 152; - public static final int QS_WIFI_TOGGLE = 153; - public static final int QS_BLUETOOTH_TOGGLE = 154; - public static final int QS_CELLULAR_TOGGLE = 155; - public static final int QS_SWITCH_USER = 156; - public static final int QS_CAST_SELECT = 157; - public static final int QS_CAST_DISCONNECT = 158; - public static final int ACTION_BLUETOOTH_TOGGLE = 159; - public static final int ACTION_BLUETOOTH_SCAN = 160; - public static final int ACTION_BLUETOOTH_RENAME = 161; - public static final int ACTION_BLUETOOTH_FILES = 162; - public static final int QS_DND_TIME = 163; - public static final int QS_DND_CONDITION_SELECT = 164; - public static final int QS_DND_ZEN_SELECT = 165; - public static final int QS_DND_TOGGLE = 166; - public static final int ACTION_ZEN_ALLOW_REMINDERS = 167; - public static final int ACTION_ZEN_ALLOW_EVENTS = 168; - public static final int ACTION_ZEN_ALLOW_MESSAGES = 169; - public static final int ACTION_ZEN_ALLOW_CALLS = 170; - public static final int ACTION_ZEN_ALLOW_REPEAT_CALLS = 171; - public static final int ACTION_ZEN_ADD_RULE = 172; - public static final int ACTION_ZEN_ADD_RULE_OK = 173; - public static final int ACTION_ZEN_DELETE_RULE = 174; - public static final int ACTION_ZEN_DELETE_RULE_OK = 175; - public static final int ACTION_ZEN_ENABLE_RULE = 176; - public static final int ACTION_AIRPLANE_TOGGLE = 177; - public static final int ACTION_CELL_DATA_TOGGLE = 178; - public static final int NOTIFICATION_ACCESS = 179; - public static final int NOTIFICATION_ZEN_MODE_ACCESS = 180; - public static final int APPLICATIONS_DEFAULT_APPS = 181; - public static final int APPLICATIONS_STORAGE_APPS = 182; - public static final int APPLICATIONS_USAGE_ACCESS_DETAIL = 183; - public static final int APPLICATIONS_HIGH_POWER_APPS = 184; - public static final int FUELGAUGE_HIGH_POWER_DETAILS = 185; - public static final int ACTION_LS_UNLOCK = 186; - public static final int ACTION_LS_SHADE = 187; - public static final int ACTION_LS_HINT = 188; - public static final int ACTION_LS_CAMERA = 189; - public static final int ACTION_LS_DIALER = 190; - public static final int ACTION_LS_LOCK = 191; - public static final int ACTION_LS_NOTE = 192; - public static final int ACTION_LS_QS = 193; - public static final int ACTION_SHADE_QS_PULL = 194; - public static final int ACTION_SHADE_QS_TAP = 195; - public static final int LOCKSCREEN = 196; - public static final int BOUNCER = 197; - public static final int SCREEN = 198; - public static final int NOTIFICATION_ALERT = 199; - public static final int ACTION_EMERGENCY_CALL = 200; - public static final int APPLICATIONS_MANAGE_ASSIST = 201; - public static final int PROCESS_STATS_SUMMARY = 202; - public static final int ACTION_ROTATION_LOCK = 203; - 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; - public static final int TUNER = 227; - public static final int TUNER_QS = 228; - public static final int TUNER_DEMO_MODE = 229; - public static final int TUNER_QS_REORDER = 230; - public static final int TUNER_QS_ADD = 231; - public static final int TUNER_QS_REMOVE = 232; - public static final int TUNER_STATUS_BAR_ENABLE = 233; - public static final int TUNER_STATUS_BAR_DISABLE = 234; - public static final int TUNER_DEMO_MODE_ENABLED = 235; - public static final int TUNER_DEMO_MODE_ON = 236; - public static final int TUNER_BATTERY_PERCENTAGE = 237; - public static final int FUELGAUGE_INACTIVE_APPS = 238; - public static final int ACTION_ASSIST_LONG_PRESS = 239; - public static final int FINGERPRINT_ENROLLING = 240; - public static final int FINGERPRINT_FIND_SENSOR = 241; - public static final int FINGERPRINT_ENROLL_FINISH = 242; - public static final int FINGERPRINT_ENROLL_INTRO = 243; - public static final int FINGERPRINT_ENROLL_ONBOARD = 244; - public static final int FINGERPRINT_ENROLL_SIDECAR = 245; - public static final int FINGERPRINT_ENROLLING_SETUP = 246; - public static final int FINGERPRINT_FIND_SENSOR_SETUP = 247; - public static final int FINGERPRINT_ENROLL_FINISH_SETUP = 248; - public static final int FINGERPRINT_ENROLL_INTRO_SETUP = 249; - public static final int FINGERPRINT_ENROLL_ONBOARD_SETUP = 250; - public static final int ACTION_FINGERPRINT_ENROLL = 251; - public static final int ACTION_FINGERPRINT_AUTH = 252; - public static final int ACTION_FINGERPRINT_DELETE = 253; - public static final int ACTION_FINGERPRINT_RENAME = 254; - public static final int ACTION_DOUBLE_TAP_POWER_CAMERA_GESTURE = 255; - public static final int ACTION_WIGGLE_CAMERA_GESTURE = 256; - public static final int QS_WORKMODE = 257; - public static final int BACKGROUND_CHECK_SUMMARY = 258; - public static final int QS_LOCK_TILE = 259; - public static final int QS_USER_TILE = 260; - public static final int QS_BATTERY_TILE = 261; - public static final int NOTIFICATION_ZEN_MODE_VISUAL_INTERRUPTIONS = 262; - public static final int ACTION_ZEN_ALLOW_PEEK = 263; - public static final int ACTION_ZEN_ALLOW_LIGHTS = 264; - public static final int NOTIFICATION_TOPIC_NOTIFICATION = 265; - public static final int ACTION_DEFAULT_SMS_APP_CHANGED = 266; - public static final int QS_COLOR_MATRIX = 267; - public static final int QS_CUSTOM = 268; - public static final int ACTION_ZEN_ALLOW_SCREEN_ON = 269; - - /** - * Logged when the user docks a window from recents by longpressing a task and dragging it to - * the dock area. - */ - public static final int ACTION_WINDOW_DOCK_DRAG_DROP = 270; - - /** - * Logged when the user docks a fullscreen window by long pressing recents which also opens - * recents on the lower/right side. - */ - public static final int ACTION_WINDOW_DOCK_LONGPRESS = 271; - - /** - * Logged when the user docks a window by dragging from the navbar which also opens recents on - * the lower/right side. - */ - public static final int ACTION_WINDOW_DOCK_SWIPE = 272; - - /** - * Logged when the user launches a profile-specific app and we intercept it with the confirm - * credentials UI. - */ - public static final int PROFILE_CHALLENGE = 273; - public static final int QS_BATTERY_DETAIL = 274; - - /** - * Logged when the user goes into the overview history. - */ - public static final int OVERVIEW_HISTORY = 275; - - /** - * Logged when the user pages through overview. - */ - public static final int ACTION_OVERVIEW_PAGE = 276; - - /** - * Logged when the user launches a task from overview. - */ - public static final int ACTION_OVERVIEW_SELECT = 277; - - /** Logged when the user views the emergency info. */ - public static final int ACTION_VIEW_EMERGENCY_INFO = 278; - - /** Logged when the user views the edit emergency info activity. */ - public static final int ACTION_EDIT_EMERGENCY_INFO = 279; - - /** Logged when the user edits an emergency info field. */ - public static final int ACTION_EDIT_EMERGENCY_INFO_FIELD = 280; - - /** Logged when the user adds a new emergency contact. */ - public static final int ACTION_ADD_EMERGENCY_CONTACT = 281; - - /** Logged when the user deletes an emergency contact. */ - public static final int ACTION_DELETE_EMERGENCY_CONTACT = 282; - - /** Logged when the user calls an emergency contact. */ - public static final int ACTION_CALL_EMERGENCY_CONTACT = 283; -} diff --git a/core/java/com/android/internal/logging/MetricsLogger.java b/core/java/com/android/internal/logging/MetricsLogger.java index 183d8d712c01..ef725da1e463 100644 --- a/core/java/com/android/internal/logging/MetricsLogger.java +++ b/core/java/com/android/internal/logging/MetricsLogger.java @@ -26,8 +26,8 @@ import com.android.internal.logging.MetricsProto.MetricsEvent; * * @hide */ -public class MetricsLogger implements com.android.internal.logging.MetricsConstants { - // define metric categories in frameworks/base/core/proto/src/metrics_constants.proto. +public class MetricsLogger { + // define metric categories in frameworks/base/proto/src/metrics_constants.proto. public static final int VIEW_UNKNOWN = MetricsEvent.VIEW_UNKNOWN; diff --git a/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java b/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java index cbf22c00d61c..40c11cfcffc1 100644 --- a/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java +++ b/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java @@ -29,6 +29,7 @@ import android.view.View; import android.widget.Button; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.telephony.IccCardConstants.State; import com.android.internal.widget.LockPatternUtils; @@ -117,7 +118,7 @@ public class EmergencyButton extends Button { * Shows the emergency dialer or returns the user to the existing call. */ public void takeEmergencyCallAction() { - MetricsLogger.action(mContext, MetricsLogger.ACTION_EMERGENCY_CALL); + MetricsLogger.action(mContext, MetricsEvent.ACTION_EMERGENCY_CALL); // TODO: implement a shorter timeout once new PowerManager API is ready. // should be the equivalent to the old userActivity(EMERGENCY_CALL_TIMEOUT) mPowerManager.userActivity(SystemClock.uptimeMillis(), true); diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java index 72629a331500..20e2fa4f0509 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java @@ -82,9 +82,8 @@ public abstract class QSTile<TState extends State> implements Listenable { /** * Declare the category of this tile. * - * Categories are defined in {@link com.android.internal.logging.MetricsLogger} - * or if there is no relevant existing category you may define one in - * {@link com.android.systemui.qs.QSTile}. + * Categories are defined in {@link com.android.internal.logging.MetricsProto.MetricsEvent} + * by editing frameworks/base/proto/src/metrics_constants.proto. */ abstract public int getMetricsCategory(); diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/BlankCustomTile.java b/packages/SystemUI/src/com/android/systemui/qs/customize/BlankCustomTile.java index ac4f05fa148c..36bed0d25c19 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/BlankCustomTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/BlankCustomTile.java @@ -20,7 +20,9 @@ import android.content.ComponentName; import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; import android.graphics.drawable.Drawable; + import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.QSTile; @@ -84,6 +86,6 @@ public class BlankCustomTile extends QSTile<QSTile.State> { @Override public int getMetricsCategory() { - return MetricsLogger.QS_INTENT; + return MetricsEvent.QS_INTENT; } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java index d398b644b9ac..886531a8a497 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java @@ -31,7 +31,9 @@ import android.util.Log; import android.view.IWindowManager; import android.view.WindowManager; import android.view.WindowManagerGlobal; + import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.QSTile; import com.android.systemui.statusbar.phone.QSTileHost; @@ -197,7 +199,7 @@ public class CustomTile extends QSTile<QSTile.State> { @Override public int getMetricsCategory() { - return MetricsLogger.QS_CUSTOM; + return MetricsEvent.QS_CUSTOM; } public void startUnlockAndRun() { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java index c696f886e33f..d78d6ffe2cfe 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java @@ -24,6 +24,7 @@ import android.net.ConnectivityManager; import android.provider.Settings.Global; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.GlobalSetting; import com.android.systemui.qs.QSTile; @@ -85,7 +86,7 @@ public class AirplaneModeTile extends QSTile<QSTile.BooleanState> { @Override public int getMetricsCategory() { - return MetricsLogger.QS_AIRPLANEMODE; + return MetricsEvent.QS_AIRPLANEMODE; } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java index 60238fc3af6b..fd8857d3ac20 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java @@ -25,7 +25,7 @@ import android.view.ViewGroup; import android.widget.Checkable; import android.widget.ImageView; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settingslib.BatteryInfo; import com.android.systemui.BatteryMeterDrawable; import com.android.systemui.R; @@ -64,7 +64,7 @@ public class BatteryTile extends QSTile<QSTile.State> implements BatteryControll @Override public int getMetricsCategory() { - return MetricsLogger.QS_BATTERY_TILE; + return MetricsEvent.QS_BATTERY_TILE; } @Override @@ -199,7 +199,7 @@ public class BatteryTile extends QSTile<QSTile.State> implements BatteryControll @Override public int getMetricsCategory() { - return MetricsLogger.QS_BATTERY_DETAIL; + return MetricsEvent.QS_BATTERY_DETAIL; } } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java index 37502904ce6b..6a07a07a7033 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java @@ -24,7 +24,9 @@ import android.provider.Settings; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; + import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.systemui.R; import com.android.systemui.qs.QSDetailItems; @@ -127,7 +129,7 @@ public class BluetoothTile extends QSTile<QSTile.BooleanState> { @Override public int getMetricsCategory() { - return MetricsLogger.QS_BLUETOOTH; + return MetricsEvent.QS_BLUETOOTH; } @Override @@ -181,14 +183,14 @@ public class BluetoothTile extends QSTile<QSTile.BooleanState> { @Override public void setToggleState(boolean state) { - MetricsLogger.action(mContext, MetricsLogger.QS_BLUETOOTH_TOGGLE, state); + MetricsLogger.action(mContext, MetricsEvent.QS_BLUETOOTH_TOGGLE, state); mController.setBluetoothEnabled(state); showDetail(false); } @Override public int getMetricsCategory() { - return MetricsLogger.QS_BLUETOOTH_DETAILS; + return MetricsEvent.QS_BLUETOOTH_DETAILS; } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java index de4c21cd1580..18eb7a1ded02 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java @@ -23,7 +23,9 @@ import android.util.Log; import android.view.View; import android.view.View.OnAttachStateChangeListener; import android.view.ViewGroup; + import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.QSDetailItems; import com.android.systemui.qs.QSDetailItems.Item; @@ -125,7 +127,7 @@ public class CastTile extends QSTile<QSTile.BooleanState> { @Override public int getMetricsCategory() { - return MetricsLogger.QS_CAST; + return MetricsEvent.QS_CAST; } @Override @@ -181,7 +183,7 @@ public class CastTile extends QSTile<QSTile.BooleanState> { @Override public int getMetricsCategory() { - return MetricsLogger.QS_CAST_DETAILS; + return MetricsEvent.QS_CAST_DETAILS; } @Override @@ -255,7 +257,7 @@ public class CastTile extends QSTile<QSTile.BooleanState> { @Override public void onDetailItemClick(Item item) { if (item == null || item.tag == null) return; - MetricsLogger.action(mContext, MetricsLogger.QS_CAST_SELECT); + MetricsLogger.action(mContext, MetricsEvent.QS_CAST_SELECT); final CastDevice device = (CastDevice) item.tag; mController.startCasting(device); } @@ -263,7 +265,7 @@ public class CastTile extends QSTile<QSTile.BooleanState> { @Override public void onDetailItemDisconnect(Item item) { if (item == null || item.tag == null) return; - MetricsLogger.action(mContext, MetricsLogger.QS_CAST_DISCONNECT); + MetricsLogger.action(mContext, MetricsEvent.QS_CAST_DISCONNECT); final CastDevice device = (CastDevice) item.tag; mController.stopCasting(device); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java index 1f8fae0fd081..aacdbc9c77d3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java @@ -23,7 +23,9 @@ import android.content.res.Resources; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settingslib.net.DataUsageController; import com.android.systemui.R; import com.android.systemui.qs.QSIconView; @@ -89,7 +91,7 @@ public class CellularTile extends QSTile<QSTile.SignalState> { protected void handleSecondaryClick() { boolean dataEnabled = mDataController.isMobileDataSupported() && mDataController.isMobileDataEnabled(); - MetricsLogger.action(mContext, MetricsLogger.QS_CELLULAR_TOGGLE, !dataEnabled); + MetricsLogger.action(mContext, MetricsEvent.QS_CELLULAR_TOGGLE, !dataEnabled); mDataController.setMobileDataEnabled(!dataEnabled); } @@ -131,7 +133,7 @@ public class CellularTile extends QSTile<QSTile.SignalState> { @Override public int getMetricsCategory() { - return MetricsLogger.QS_CELLULAR; + return MetricsEvent.QS_CELLULAR; } // Remove the period from the network name @@ -241,13 +243,13 @@ public class CellularTile extends QSTile<QSTile.SignalState> { @Override public void setToggleState(boolean state) { - MetricsLogger.action(mContext, MetricsLogger.QS_CELLULAR_TOGGLE, state); + MetricsLogger.action(mContext, MetricsEvent.QS_CELLULAR_TOGGLE, state); mDataController.setMobileDataEnabled(state); } @Override public int getMetricsCategory() { - return MetricsLogger.QS_DATAUSAGEDETAIL; + return MetricsEvent.QS_DATAUSAGEDETAIL; } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java index 23a15b9d68ab..6e843e911212 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java @@ -17,7 +17,9 @@ package com.android.systemui.qs.tiles; import android.provider.Settings.Secure; + import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.QSTile; import com.android.systemui.qs.SecureSetting; @@ -84,7 +86,7 @@ public class ColorInversionTile extends QSTile<QSTile.BooleanState> { @Override public int getMetricsCategory() { - return MetricsLogger.QS_COLORINVERSION; + return MetricsEvent.QS_COLORINVERSION; } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java index 39eda6b3b86e..1f9f1c4a6102 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java @@ -30,7 +30,9 @@ import android.view.View; import android.view.View.OnAttachStateChangeListener; import android.view.ViewGroup; import android.widget.Toast; + import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.Prefs; import com.android.systemui.R; import com.android.systemui.SysUIToast; @@ -154,7 +156,7 @@ public class DndTile extends QSTile<QSTile.BooleanState> { @Override public int getMetricsCategory() { - return MetricsLogger.QS_DND; + return MetricsEvent.QS_DND; } @Override @@ -229,7 +231,7 @@ public class DndTile extends QSTile<QSTile.BooleanState> { @Override public void setToggleState(boolean state) { - MetricsLogger.action(mContext, MetricsLogger.QS_DND_TOGGLE, state); + MetricsLogger.action(mContext, MetricsEvent.QS_DND_TOGGLE, state); if (!state) { mController.setZen(Global.ZEN_MODE_OFF, null, TAG); showDetail(false); @@ -238,7 +240,7 @@ public class DndTile extends QSTile<QSTile.BooleanState> { @Override public int getMetricsCategory() { - return MetricsLogger.QS_DND_DETAILS; + return MetricsEvent.QS_DND_DETAILS; } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java index 39d9da12d4a1..1d9f15bbf7a9 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java @@ -17,7 +17,9 @@ package com.android.systemui.qs.tiles; import android.app.ActivityManager; + import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.QSTile; import com.android.systemui.statusbar.policy.FlashlightController; @@ -92,7 +94,7 @@ public class FlashlightTile extends QSTile<QSTile.BooleanState> implements @Override public int getMetricsCategory() { - return MetricsLogger.QS_FLASHLIGHT; + return MetricsEvent.QS_FLASHLIGHT; } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java index 55aa32bb0db9..db8604759439 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java @@ -17,6 +17,7 @@ package com.android.systemui.qs.tiles; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.QSTile; import com.android.systemui.statusbar.policy.HotspotController; @@ -75,7 +76,7 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> { @Override public int getMetricsCategory() { - return MetricsLogger.QS_HOTSPOT; + return MetricsEvent.QS_HOTSPOT; } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/IntentTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/IntentTile.java index 0883445891a4..e1dc9f2b9cc2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/IntentTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/IntentTile.java @@ -30,6 +30,7 @@ import android.text.TextUtils; import android.util.Log; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.qs.QSTile; import java.util.Arrays; @@ -155,7 +156,7 @@ public class IntentTile extends QSTile<QSTile.State> { @Override public int getMetricsCategory() { - return MetricsLogger.QS_INTENT; + return MetricsEvent.QS_INTENT; } private final BroadcastReceiver mReceiver = new BroadcastReceiver() { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java index e79aabfb8bf8..724659c6a168 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java @@ -17,6 +17,7 @@ package com.android.systemui.qs.tiles; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.QSTile; import com.android.systemui.statusbar.policy.KeyguardMonitor; @@ -99,7 +100,7 @@ public class LocationTile extends QSTile<QSTile.BooleanState> { @Override public int getMetricsCategory() { - return MetricsLogger.QS_LOCATION; + return MetricsEvent.QS_LOCATION; } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java index 79155b294616..f920d4806284 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java @@ -18,7 +18,9 @@ package com.android.systemui.qs.tiles; import android.content.Context; import android.content.res.Configuration; + import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.QSTile; import com.android.systemui.statusbar.policy.RotationLockController; @@ -108,7 +110,7 @@ public class RotationLockTile extends QSTile<QSTile.BooleanState> { @Override public int getMetricsCategory() { - return MetricsLogger.QS_ROTATIONLOCK; + return MetricsEvent.QS_ROTATIONLOCK; } /** diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java index b44ef0b46493..2c8a4784e5f2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java @@ -24,6 +24,7 @@ import android.view.View; import android.view.ViewGroup; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settingslib.RestrictedLockUtils; import com.android.systemui.R; import com.android.systemui.qs.PseudoGridView; @@ -94,7 +95,7 @@ public class UserDetailView extends PseudoGridView { mContext, tag.enforcedAdmin); mController.startActivity(intent); } else { - MetricsLogger.action(mContext, MetricsLogger.QS_SWITCH_USER); + MetricsLogger.action(mContext, MetricsEvent.QS_SWITCH_USER); switchTo(tag); } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserTile.java index d29cae4caace..6eb0646afaea 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserTile.java @@ -18,7 +18,7 @@ package com.android.systemui.qs.tiles; import android.content.Context; import android.graphics.drawable.Drawable; import android.util.Pair; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.qs.QSTile; import com.android.systemui.statusbar.policy.UserInfoController; import com.android.systemui.statusbar.policy.UserSwitcherController; @@ -52,7 +52,7 @@ public class UserTile extends QSTile<QSTile.State> implements UserInfoController @Override public int getMetricsCategory() { - return MetricsLogger.QS_USER_TILE; + return MetricsEvent.QS_USER_TILE; } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java index 95ea3f886e09..42296f2aad36 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java @@ -24,7 +24,9 @@ import android.provider.Settings; import android.util.Log; import android.view.View; import android.view.ViewGroup; + import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settingslib.wifi.AccessPoint; import com.android.systemui.R; import com.android.systemui.qs.QSDetailItems; @@ -162,7 +164,7 @@ public class WifiTile extends QSTile<QSTile.SignalState> { @Override public int getMetricsCategory() { - return MetricsLogger.QS_WIFI; + return MetricsEvent.QS_WIFI; } @Override @@ -256,14 +258,14 @@ public class WifiTile extends QSTile<QSTile.SignalState> { @Override public void setToggleState(boolean state) { if (DEBUG) Log.d(TAG, "setToggleState " + state); - MetricsLogger.action(mContext, MetricsLogger.QS_WIFI_TOGGLE, state); + MetricsLogger.action(mContext, MetricsEvent.QS_WIFI_TOGGLE, state); mController.setWifiEnabled(state); showDetail(false); } @Override public int getMetricsCategory() { - return MetricsLogger.QS_WIFI_DETAILS; + return MetricsEvent.QS_WIFI_DETAILS; } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java index 34ed37b2b75d..508490ffa881 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java @@ -24,7 +24,9 @@ import android.content.IntentFilter; import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; + import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.QSTile; @@ -124,7 +126,7 @@ public class WorkModeTile extends QSTile<QSTile.BooleanState> { @Override public int getMetricsCategory() { - return MetricsLogger.QS_WORKMODE; + return MetricsEvent.QS_WORKMODE; } @Override diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java index 189e8d3568da..fa30eed79210 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java @@ -37,7 +37,9 @@ import android.view.View; import android.view.ViewStub; import android.view.ViewTreeObserver; import android.view.WindowManager; + import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.recents.events.EventBus; import com.android.systemui.recents.events.activity.AppWidgetProviderChangedEvent; @@ -402,7 +404,7 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD SystemServicesProxy ssp = Recents.getSystemServices(); EventBus.getDefault().send(new RecentsVisibilityChangedEvent(this, ssp, true)); - MetricsLogger.visible(this, MetricsLogger.OVERVIEW_ACTIVITY); + MetricsLogger.visible(this, MetricsEvent.OVERVIEW_ACTIVITY); mRecentsView.getViewTreeObserver().addOnPreDrawListener( new ViewTreeObserver.OnPreDrawListener() { @@ -460,7 +462,7 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD launchState.launchedHasConfigurationChanged = false; launchState.launchedViaDragGesture = false; - MetricsLogger.hidden(this, MetricsLogger.OVERVIEW_ACTIVITY); + MetricsLogger.hidden(this, MetricsEvent.OVERVIEW_ACTIVITY); } @Override @@ -633,7 +635,7 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD // Focus the next task EventBus.getDefault().send(new FocusNextTaskViewEvent(timerIndicatorDuration)); - MetricsLogger.action(this, MetricsLogger.ACTION_OVERVIEW_PAGE); + MetricsLogger.action(this, MetricsEvent.ACTION_OVERVIEW_PAGE); } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryAdapter.java b/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryAdapter.java index f6655c7f86a2..40009917f391 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryAdapter.java @@ -26,7 +26,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; + import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.recents.Recents; import com.android.systemui.recents.events.EventBus; @@ -132,7 +134,7 @@ public class RecentsHistoryAdapter extends RecyclerView.Adapter<RecentsHistoryAd ssp.startActivityFromRecents(v.getContext(), task.key.id, task.title, ActivityOptions.makeBasic()); - MetricsLogger.action(v.getContext(), MetricsLogger.ACTION_OVERVIEW_SELECT, + MetricsLogger.action(v.getContext(), MetricsEvent.ACTION_OVERVIEW_SELECT, task.key.getComponent().toString()); } diff --git a/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryView.java b/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryView.java index 39bb6cac56cd..b9921b6940ab 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryView.java @@ -28,7 +28,9 @@ import android.view.WindowInsets; import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; import android.widget.LinearLayout; + import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.recents.Recents; import com.android.systemui.recents.RecentsActivity; @@ -101,7 +103,7 @@ public class RecentsHistoryView extends LinearLayout { mAdapter.updateTasks(getContext(), stack); mIsVisible = true; - MetricsLogger.visible(mRecyclerView.getContext(), MetricsLogger.OVERVIEW_HISTORY); + MetricsLogger.visible(mRecyclerView.getContext(), MetricsEvent.OVERVIEW_HISTORY); } /** @@ -133,7 +135,7 @@ public class RecentsHistoryView extends LinearLayout { } mIsVisible = false; - MetricsLogger.hidden(mRecyclerView.getContext(), MetricsLogger.OVERVIEW_HISTORY); + MetricsLogger.hidden(mRecyclerView.getContext(), MetricsEvent.OVERVIEW_HISTORY); } /** diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java index e448101577de..a00b4978679c 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java @@ -34,7 +34,9 @@ import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; import android.widget.FrameLayout; import android.widget.TextView; + import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.recents.Recents; import com.android.systemui.recents.RecentsActivity; @@ -537,8 +539,7 @@ public class RecentsView extends FrameLayout { } })); - MetricsLogger.action(mContext, - MetricsLogger.ACTION_WINDOW_DOCK_DRAG_DROP); + MetricsLogger.action(mContext, MetricsEvent.ACTION_WINDOW_DOCK_DRAG_DROP); } else { // Animate the overlay alpha back to 0 updateVisibleDockRegions(null, true /* isDefaultDockState */, -1, diff --git a/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java b/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java index 77c27fa043c2..d5131beb0153 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java +++ b/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java @@ -31,6 +31,7 @@ import android.provider.Settings; import android.widget.ImageView; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import java.util.ArrayList; @@ -205,7 +206,7 @@ public class BrightnessController implements ToggleSlider.Listener { if (!mAutomatic) { final int val = value + mMinimumBacklight; if (stopTracking) { - MetricsLogger.action(mContext, MetricsLogger.ACTION_BRIGHTNESS, val); + MetricsLogger.action(mContext, MetricsEvent.ACTION_BRIGHTNESS, val); } setBrightness(val); if (!tracking) { @@ -220,7 +221,7 @@ public class BrightnessController implements ToggleSlider.Listener { } else { final float adj = value / (BRIGHTNESS_ADJ_RESOLUTION / 2f) - 1; if (stopTracking) { - MetricsLogger.action(mContext, MetricsLogger.ACTION_BRIGHTNESS_AUTO, value); + MetricsLogger.action(mContext, MetricsEvent.ACTION_BRIGHTNESS_AUTO, value); } setBrightnessAdj(adj); if (!tracking) { diff --git a/packages/SystemUI/src/com/android/systemui/settings/BrightnessDialog.java b/packages/SystemUI/src/com/android/systemui/settings/BrightnessDialog.java index cef4d34a1d29..495223456b2b 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/BrightnessDialog.java +++ b/packages/SystemUI/src/com/android/systemui/settings/BrightnessDialog.java @@ -25,6 +25,7 @@ import android.view.WindowManager; import android.widget.ImageView; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.R; /** A dialog that provides controls for adjusting the screen brightness. */ @@ -53,13 +54,13 @@ public class BrightnessDialog extends Activity { protected void onStart() { super.onStart(); mBrightnessController.registerCallbacks(); - MetricsLogger.visible(this, MetricsLogger.BRIGHTNESS_DIALOG); + MetricsLogger.visible(this, MetricsEvent.BRIGHTNESS_DIALOG); } @Override protected void onStop() { super.onStop(); - MetricsLogger.hidden(this, MetricsLogger.BRIGHTNESS_DIALOG); + MetricsLogger.hidden(this, MetricsEvent.BRIGHTNESS_DIALOG); mBrightnessController.unregisterCallbacks(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index efa56bce6c5a..5359dd27f95b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -81,7 +81,9 @@ import android.widget.ImageView; import android.widget.RemoteViews; import android.widget.TextView; import android.widget.Toast; + import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.statusbar.IStatusBarService; import com.android.internal.statusbar.StatusBarIcon; import com.android.internal.util.NotificationColorUtil; @@ -947,7 +949,7 @@ public abstract class BaseStatusBar extends SystemUI implements final int appUidF = appUid; settingsButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - MetricsLogger.action(mContext, MetricsLogger.ACTION_NOTE_INFO); + MetricsLogger.action(mContext, MetricsEvent.ACTION_NOTE_INFO); startAppNotificationSettingsActivity(pkg, appUidF); } }); @@ -994,7 +996,7 @@ public abstract class BaseStatusBar extends SystemUI implements return false; } - MetricsLogger.action(mContext, MetricsLogger.ACTION_NOTE_CONTROLS); + MetricsLogger.action(mContext, MetricsEvent.ACTION_NOTE_CONTROLS); // ensure that it's layouted but not visible until actually laid out guts.setVisibility(View.INVISIBLE); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java index 92288a3c12c3..786e64d0398c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java @@ -27,6 +27,7 @@ import android.view.View; import android.view.ViewConfiguration; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.RecentsComponent; import com.android.systemui.stackdivider.Divider; @@ -218,8 +219,7 @@ public class NavigationBarGestureHelper extends GestureDetector.SimpleOnGestureL mDivider.getView().startDragging(false /* animate */, true /* touching*/); } mDockWindowTouchSlopExceeded = true; - MetricsLogger.action(mContext, - MetricsLogger.ACTION_WINDOW_DOCK_SWIPE); + MetricsLogger.action(mContext, MetricsEvent.ACTION_WINDOW_DOCK_SWIPE); return true; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 6fa1f5df460c..f2dea3c83f95 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -94,6 +94,7 @@ import android.widget.ImageView; import android.widget.TextView; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.statusbar.NotificationVisibility; import com.android.internal.statusbar.StatusBarIcon; import com.android.keyguard.KeyguardHostView.OnDismissAction; @@ -752,7 +753,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, mDismissView.setOnButtonClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - MetricsLogger.action(mContext, MetricsLogger.ACTION_DISMISS_ALL_NOTES); + MetricsLogger.action(mContext, MetricsEvent.ACTION_DISMISS_ALL_NOTES); clearAllNotifications(); } }); @@ -1122,8 +1123,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, ActivityManager.DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT, initialBounds); if (docked) { - MetricsLogger.action(mContext, - MetricsLogger.ACTION_WINDOW_DOCK_LONGPRESS); + MetricsLogger.action(mContext, MetricsEvent.ACTION_WINDOW_DOCK_LONGPRESS); return true; } } @@ -1138,7 +1138,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, if (shouldDisableNavbarGestures()) { return false; } - MetricsLogger.action(mContext, MetricsLogger.ACTION_ASSIST_LONG_PRESS); + MetricsLogger.action(mContext, MetricsEvent.ACTION_ASSIST_LONG_PRESS); mAssistManager.startAssist(new Bundle() /* args */); awakenDreams(); if (mNavigationBarView != null) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java index 05d9626aaf38..e4ded67eb702 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java @@ -49,7 +49,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.BaseAdapter; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.util.UserIcons; import com.android.settingslib.RestrictedLockUtils; import com.android.systemui.BitmapHelper; @@ -724,7 +724,7 @@ public class UserSwitcherController { @Override public int getMetricsCategory() { - return MetricsLogger.QS_USERDETAIL; + return MetricsEvent.QS_USERDETAIL; } }; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/ColorMatrixTile.java b/packages/SystemUI/src/com/android/systemui/tuner/ColorMatrixTile.java index 1fd235206c74..32068823e4ea 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/ColorMatrixTile.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/ColorMatrixTile.java @@ -17,7 +17,7 @@ package com.android.systemui.tuner; import android.app.ActivityManager; import android.provider.Settings; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.QSTile; import libcore.util.Objects; @@ -102,6 +102,6 @@ public class ColorMatrixTile extends QSTile<QSTile.State> implements TunerServic @Override public int getMetricsCategory() { - return MetricsLogger.QS_COLOR_MATRIX; + return MetricsEvent.QS_COLOR_MATRIX; } } diff --git a/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java index f1de2342c9ad..f80196302d48 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java @@ -31,6 +31,7 @@ import android.support.v7.preference.PreferenceScreen; import android.view.MenuItem; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.DemoMode; import com.android.systemui.R; @@ -94,13 +95,13 @@ public class DemoModeFragment extends PreferenceFragment implements OnPreference @Override public void onResume() { super.onResume(); - MetricsLogger.visibility(getContext(), MetricsLogger.TUNER_DEMO_MODE, true); + MetricsLogger.visibility(getContext(), MetricsEvent.TUNER_DEMO_MODE, true); } @Override public void onPause() { super.onPause(); - MetricsLogger.visibility(getContext(), MetricsLogger.TUNER_DEMO_MODE, false); + MetricsLogger.visibility(getContext(), MetricsEvent.TUNER_DEMO_MODE, false); } @Override @@ -131,10 +132,10 @@ public class DemoModeFragment extends PreferenceFragment implements OnPreference mOnSwitch.setChecked(false); stopDemoMode(); } - MetricsLogger.action(getContext(), MetricsLogger.TUNER_DEMO_MODE_ENABLED, enabled); + MetricsLogger.action(getContext(), MetricsEvent.TUNER_DEMO_MODE_ENABLED, enabled); setGlobal(DemoMode.DEMO_MODE_ALLOWED, enabled ? 1 : 0); } else if (preference == mOnSwitch) { - MetricsLogger.action(getContext(), MetricsLogger.TUNER_DEMO_MODE_ON, enabled); + MetricsLogger.action(getContext(), MetricsEvent.TUNER_DEMO_MODE_ON, enabled); if (enabled) { startDemoMode(); } else { diff --git a/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java b/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java index 920ec7572b8a..f2f0382060c7 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java @@ -24,6 +24,7 @@ import android.text.TextUtils; import android.util.AttributeSet; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.statusbar.phone.StatusBarIconController; import com.android.systemui.tuner.TunerService.Tunable; @@ -63,14 +64,14 @@ public class StatusBarSwitch extends SwitchPreference implements Tunable { if (!value) { // If not enabled add to blacklist. if (!mBlacklist.contains(getKey())) { - MetricsLogger.action(getContext(), MetricsLogger.TUNER_STATUS_BAR_DISABLE, + MetricsLogger.action(getContext(), MetricsEvent.TUNER_STATUS_BAR_DISABLE, getKey()); mBlacklist.add(getKey()); setList(mBlacklist); } } else { if (mBlacklist.remove(getKey())) { - MetricsLogger.action(getContext(), MetricsLogger.TUNER_STATUS_BAR_ENABLE, getKey()); + MetricsLogger.action(getContext(), MetricsEvent.TUNER_STATUS_BAR_ENABLE, getKey()); setList(mBlacklist); } } diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java index a3fe6bb61a18..427b5e8480b2 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java @@ -36,6 +36,7 @@ import android.view.MenuInflater; import android.view.MenuItem; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.R; import static com.android.systemui.BatteryMeterDrawable.SHOW_PERCENT_SETTING; @@ -84,7 +85,7 @@ public class TunerFragment extends PreferenceFragment { getContext().getContentResolver().registerContentObserver( System.getUriFor(SHOW_PERCENT_SETTING), false, mSettingObserver); - MetricsLogger.visibility(getContext(), MetricsLogger.TUNER, true); + MetricsLogger.visibility(getContext(), MetricsEvent.TUNER, true); } @Override @@ -92,7 +93,7 @@ public class TunerFragment extends PreferenceFragment { super.onPause(); getContext().getContentResolver().unregisterContentObserver(mSettingObserver); - MetricsLogger.visibility(getContext(), MetricsLogger.TUNER, false); + MetricsLogger.visibility(getContext(), MetricsEvent.TUNER, false); } @Override @@ -141,7 +142,7 @@ public class TunerFragment extends PreferenceFragment { @Override public boolean onPreferenceChange(Preference preference, Object newValue) { final boolean v = (Boolean) newValue; - MetricsLogger.action(getContext(), MetricsLogger.TUNER_BATTERY_PERCENTAGE, v); + MetricsLogger.action(getContext(), MetricsEvent.TUNER_BATTERY_PERCENTAGE, v); System.putInt(getContext().getContentResolver(), SHOW_PERCENT_SETTING, v ? 1 : 0); return true; } diff --git a/packages/SystemUI/src/com/android/systemui/volume/Events.java b/packages/SystemUI/src/com/android/systemui/volume/Events.java index 893c9395f23f..8e0f9b88af3e 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/Events.java +++ b/packages/SystemUI/src/com/android/systemui/volume/Events.java @@ -23,6 +23,7 @@ import android.provider.Settings.Global; import android.util.Log; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.volume.VolumeDialogController.State; import java.util.Arrays; @@ -111,33 +112,33 @@ public class Events { sb.append(" "); switch (tag) { case EVENT_SHOW_DIALOG: - MetricsLogger.visible(context, MetricsLogger.VOLUME_DIALOG); + MetricsLogger.visible(context, MetricsEvent.VOLUME_DIALOG); MetricsLogger.histogram(context, "volume_from_keyguard", (Boolean) list[1] ? 1 : 0); sb.append(SHOW_REASONS[(Integer) list[0]]).append(" keyguard=").append(list[1]); break; case EVENT_EXPAND: - MetricsLogger.visibility(context, MetricsLogger.VOLUME_DIALOG_DETAILS, + MetricsLogger.visibility(context, MetricsEvent.VOLUME_DIALOG_DETAILS, (Boolean) list[0]); sb.append(list[0]); break; case EVENT_DISMISS_DIALOG: - MetricsLogger.hidden(context, MetricsLogger.VOLUME_DIALOG); + MetricsLogger.hidden(context, MetricsEvent.VOLUME_DIALOG); sb.append(DISMISS_REASONS[(Integer) list[0]]); break; case EVENT_ACTIVE_STREAM_CHANGED: - MetricsLogger.action(context, MetricsLogger.ACTION_VOLUME_STREAM, + MetricsLogger.action(context, MetricsEvent.ACTION_VOLUME_STREAM, (Integer) list[0]); sb.append(AudioSystem.streamToString((Integer) list[0])); break; case EVENT_ICON_CLICK: - MetricsLogger.action(context, MetricsLogger.ACTION_VOLUME_ICON, + MetricsLogger.action(context, MetricsEvent.ACTION_VOLUME_ICON, (Integer) list[1]); sb.append(AudioSystem.streamToString((Integer) list[0])).append(' ') .append(iconStateToString((Integer) list[1])); break; case EVENT_TOUCH_LEVEL_DONE: - MetricsLogger.action(context, MetricsLogger.ACTION_VOLUME_SLIDER, + MetricsLogger.action(context, MetricsEvent.ACTION_VOLUME_SLIDER, (Integer) list[1]); // fall through case EVENT_TOUCH_LEVEL_CHANGED: @@ -147,13 +148,13 @@ public class Events { .append(list[1]); break; case EVENT_KEY: - MetricsLogger.action(context, MetricsLogger.ACTION_VOLUME_KEY, + MetricsLogger.action(context, MetricsEvent.ACTION_VOLUME_KEY, (Integer) list[1]); sb.append(AudioSystem.streamToString((Integer) list[0])).append(' ') .append(list[1]); break; case EVENT_EXTERNAL_RINGER_MODE_CHANGED: - MetricsLogger.action(context, MetricsLogger.ACTION_RINGER_MODE, + MetricsLogger.action(context, MetricsEvent.ACTION_RINGER_MODE, (Integer) list[0]); // fall through case EVENT_INTERNAL_RINGER_MODE_CHANGED: diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java index f73ba6ff5de6..e9594a3adb3b 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java +++ b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java @@ -51,6 +51,7 @@ import android.widget.RadioButton; import android.widget.TextView; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.Prefs; import com.android.systemui.R; import com.android.systemui.statusbar.policy.ZenModeController; @@ -620,7 +621,7 @@ public class ZenModePanel extends LinearLayout { if (childTag == null || childTag == tag) continue; childTag.rb.setChecked(false); } - MetricsLogger.action(mContext, MetricsLogger.QS_DND_CONDITION_SELECT); + MetricsLogger.action(mContext, MetricsEvent.QS_DND_CONDITION_SELECT); select(tag.condition); announceConditionSelection(tag); } @@ -725,7 +726,7 @@ public class ZenModePanel extends LinearLayout { } private void onClickTimeButton(View row, ConditionTag tag, boolean up, int rowId) { - MetricsLogger.action(mContext, MetricsLogger.QS_DND_TIME, up); + MetricsLogger.action(mContext, MetricsEvent.QS_DND_TIME, up); Condition newCondition = null; final int N = MINUTE_BUCKETS.length; if (mBucketIndex == -1) { @@ -928,7 +929,7 @@ public class ZenModePanel extends LinearLayout { if (value != null && mZenButtons.isShown() && isAttachedToWindow()) { final int zen = (Integer) value; if (fromClick) { - MetricsLogger.action(mContext, MetricsLogger.QS_DND_ZEN_SELECT, zen); + MetricsLogger.action(mContext, MetricsEvent.QS_DND_ZEN_SELECT, zen); } if (DEBUG) Log.d(mTag, "mZenButtonsCallback selected=" + zen); final Uri realConditionId = getRealConditionId(mSessionExitCondition); diff --git a/services/core/java/com/android/server/GestureLauncherService.java b/services/core/java/com/android/server/GestureLauncherService.java index 2aa039064410..d6575e84352d 100644 --- a/services/core/java/com/android/server/GestureLauncherService.java +++ b/services/core/java/com/android/server/GestureLauncherService.java @@ -38,6 +38,7 @@ import android.util.Slog; import android.view.KeyEvent; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.server.statusbar.StatusBarManagerInternal; /** @@ -270,7 +271,7 @@ public class GestureLauncherService extends SystemService { launched = handleCameraLaunchGesture(false /* useWakelock */, StatusBarManager.CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP); if (launched) { - MetricsLogger.action(mContext, MetricsLogger.ACTION_DOUBLE_TAP_POWER_CAMERA_GESTURE, + MetricsLogger.action(mContext, MetricsEvent.ACTION_DOUBLE_TAP_POWER_CAMERA_GESTURE, (int) doubleTapInterval); } } @@ -341,7 +342,7 @@ public class GestureLauncherService extends SystemService { } if (handleCameraLaunchGesture(true /* useWakelock */, StatusBarManager.CAMERA_LAUNCH_SOURCE_WIGGLE)) { - MetricsLogger.action(mContext, MetricsLogger.ACTION_WIGGLE_CAMERA_GESTURE); + MetricsLogger.action(mContext, MetricsEvent.ACTION_WIGGLE_CAMERA_GESTURE); trackCameraLaunchEvent(event); } return; diff --git a/services/core/java/com/android/server/dreams/DreamController.java b/services/core/java/com/android/server/dreams/DreamController.java index 206cc8a256d8..a63399656bab 100644 --- a/services/core/java/com/android/server/dreams/DreamController.java +++ b/services/core/java/com/android/server/dreams/DreamController.java @@ -17,6 +17,7 @@ package com.android.server.dreams; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import android.content.ComponentName; import android.content.Context; @@ -131,7 +132,7 @@ final class DreamController { mDreamStartTime = SystemClock.elapsedRealtime(); MetricsLogger.visible(mContext, - mCurrentDream.mCanDoze ? MetricsLogger.DOZING : MetricsLogger.DREAMING); + mCurrentDream.mCanDoze ? MetricsEvent.DOZING : MetricsEvent.DREAMING); try { mIWindowManager.addWindowToken(token, WindowManager.LayoutParams.TYPE_DREAM); @@ -196,7 +197,7 @@ final class DreamController { + ", isTest=" + oldDream.mIsTest + ", canDoze=" + oldDream.mCanDoze + ", userId=" + oldDream.mUserId); MetricsLogger.hidden(mContext, - oldDream.mCanDoze ? MetricsLogger.DOZING : MetricsLogger.DREAMING); + oldDream.mCanDoze ? MetricsEvent.DOZING : MetricsEvent.DREAMING); MetricsLogger.histogram(mContext, oldDream.mCanDoze ? "dozing_minutes" : "dreaming_minutes" , (int) ((SystemClock.elapsedRealtime() - mDreamStartTime) / (1000L * 60L))); diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java index e74d636fe389..13e764828c34 100644 --- a/services/core/java/com/android/server/fingerprint/FingerprintService.java +++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java @@ -48,6 +48,7 @@ import android.os.UserManager; import android.util.Slog; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.server.SystemService; import org.json.JSONArray; @@ -686,7 +687,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe private boolean sendEnrollResult(int fpId, int groupId, int remaining) { if (receiver == null) return true; // client not listening FingerprintUtils.vibrateFingerprintSuccess(getContext()); - MetricsLogger.action(mContext, MetricsLogger.ACTION_FINGERPRINT_ENROLL); + MetricsLogger.action(mContext, MetricsEvent.ACTION_FINGERPRINT_ENROLL); try { receiver.onEnrollResult(mHalDeviceId, fpId, groupId, remaining); return remaining == 0; @@ -704,7 +705,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe boolean authenticated = fpId != 0; if (receiver != null) { try { - MetricsLogger.action(mContext, MetricsLogger.ACTION_FINGERPRINT_AUTH, + MetricsLogger.action(mContext, MetricsEvent.ACTION_FINGERPRINT_AUTH, authenticated); if (!authenticated) { receiver.onAuthenticationFailed(mHalDeviceId); |