From 9d1bfd1e8de6e46137a9571507c03526880d6a46 Mon Sep 17 00:00:00 2001 From: Chris Wren Date: Tue, 26 Jan 2016 18:04:01 -0500 Subject: [PATCH] port settings over to new metrics enum Change-Id: I0b3efd2f4db773ccbc52bfe59ee8eb0dab9584fb --- .../android/settings/AirplaneModeEnabler.java | 3 ++- src/com/android/settings/ApnEditor.java | 4 ++-- src/com/android/settings/ApnSettings.java | 4 ++-- .../android/settings/ApplicationSettings.java | 6 +++--- .../android/settings/ChooseLockGeneric.java | 4 ++-- .../android/settings/ChooseLockPassword.java | 4 ++-- .../android/settings/ChooseLockPattern.java | 4 ++-- .../android/settings/ConfirmLockPassword.java | 4 ++-- .../android/settings/ConfirmLockPattern.java | 4 ++-- .../android/settings/CryptKeeperConfirm.java | 4 ++-- .../android/settings/CryptKeeperSettings.java | 4 ++-- .../android/settings/DateTimeSettings.java | 4 ++-- .../android/settings/DevelopmentSettings.java | 4 ++-- .../android/settings/DeviceInfoSettings.java | 5 ++--- src/com/android/settings/DisplaySettings.java | 5 +++-- src/com/android/settings/DreamSettings.java | 4 ++-- .../settings/EncryptionInterstitial.java | 4 ++-- src/com/android/settings/HomeSettings.java | 4 ++-- src/com/android/settings/IccLockSettings.java | 4 ++-- .../settings/InstrumentedActivity.java | 2 +- .../settings/InstrumentedFragment.java | 2 +- .../InstrumentedPreferenceActivity.java | 2 +- .../InstrumentedPreferenceFragment.java | 2 +- src/com/android/settings/LegalSettings.java | 4 ++-- src/com/android/settings/MasterClear.java | 4 ++-- .../android/settings/MasterClearConfirm.java | 4 ++-- src/com/android/settings/PrivacySettings.java | 4 ++-- .../ProfileChallengePreferenceFragment.java | 4 ++-- src/com/android/settings/ProxySelector.java | 4 ++-- src/com/android/settings/ResetNetwork.java | 4 ++-- .../android/settings/ResetNetworkConfirm.java | 4 ++-- .../settings/ScreenPinningSettings.java | 4 ++-- .../android/settings/SecuritySettings.java | 4 ++-- src/com/android/settings/TetherSettings.java | 4 ++-- .../android/settings/TrustAgentSettings.java | 4 ++-- .../settings/TrustedCredentialsSettings.java | 4 ++-- .../settings/WallpaperTypeSettings.java | 4 ++-- .../android/settings/WifiCallingSettings.java | 3 ++- .../android/settings/WirelessSettings.java | 4 ++-- .../accessibility/AccessibilitySettings.java | 10 +++++----- .../AccessibilitySettingsForSetupWizard.java | 4 ++-- .../CaptionPropertiesFragment.java | 4 ++-- ...ccessibilityServicePreferenceFragment.java | 4 ++-- .../ToggleDaltonizerPreferenceFragment.java | 4 ++-- ...ToggleGlobalGesturePreferenceFragment.java | 4 ++-- ...ScreenMagnificationPreferenceFragment.java | 5 ++--- .../settings/accounts/AccountSettings.java | 6 +++--- .../accounts/AccountSyncSettings.java | 11 ++++------ .../accounts/ChooseAccountActivity.java | 7 ++++--- .../accounts/ManageAccountsSettings.java | 5 +++-- .../applications/AdvancedAppSettings.java | 4 ++-- .../applications/AppLaunchSettings.java | 4 ++-- .../settings/applications/AppOpsDetails.java | 4 ++-- .../settings/applications/AppOpsSummary.java | 4 ++-- .../applications/AppStorageSettings.java | 4 ++-- .../applications/BackgroundCheckSummary.java | 4 ++-- .../applications/DrawOverlayDetails.java | 4 ++-- .../applications/InstalledAppDetails.java | 4 ++-- .../applications/ManageApplications.java | 20 +++++++++---------- .../settings/applications/ManageAssist.java | 4 ++-- .../applications/ManageDefaultApps.java | 4 ++-- .../applications/ProcessStatsDetail.java | 4 ++-- .../applications/ProcessStatsMemDetail.java | 4 ++-- .../applications/ProcessStatsSummary.java | 4 ++-- .../settings/applications/ProcessStatsUi.java | 4 ++-- .../applications/RunningServiceDetails.java | 4 ++-- .../applications/UsageAccessDetails.java | 4 ++-- .../applications/WriteSettingsDetails.java | 4 ++-- .../backup/ToggleBackupSettingFragment.java | 4 ++-- .../settings/bluetooth/BluetoothEnabler.java | 3 ++- .../settings/bluetooth/BluetoothSettings.java | 10 ++++++---- .../bluetooth/DevicePickerFragment.java | 4 ++-- .../settings/dashboard/DashboardSummary.java | 4 ++-- .../dashboard/SearchResultsSummary.java | 5 +++-- .../datausage/CellDataPreference.java | 4 +++- .../datausage/DataUsageMeteredSettings.java | 4 ++-- .../settings/datausage/DataUsageSummary.java | 4 ++-- .../settings/deviceinfo/ImeiInformation.java | 4 ++-- .../deviceinfo/PrivateVolumeForget.java | 4 ++-- .../deviceinfo/PrivateVolumeFormat.java | 4 ++-- .../deviceinfo/PrivateVolumeSettings.java | 4 ++-- .../deviceinfo/PrivateVolumeUnmount.java | 4 ++-- .../deviceinfo/PublicVolumeSettings.java | 4 ++-- .../settings/deviceinfo/SimStatus.java | 4 ++-- .../android/settings/deviceinfo/Status.java | 4 ++-- .../settings/deviceinfo/StorageSettings.java | 4 ++-- .../FingerprintEnrollEnrolling.java | 4 ++-- .../FingerprintEnrollFindSensor.java | 4 ++-- .../fingerprint/FingerprintEnrollFinish.java | 4 ++-- .../FingerprintEnrollIntroduction.java | 4 ++-- .../fingerprint/FingerprintEnrollSidecar.java | 4 ++-- .../fingerprint/FingerprintSettings.java | 7 ++++--- .../SetupFingerprintEnrollEnrolling.java | 4 ++-- .../SetupFingerprintEnrollFindSensor.java | 4 ++-- .../SetupFingerprintEnrollFinish.java | 4 ++-- .../SetupFingerprintEnrollIntroduction.java | 4 ++-- .../fuelgauge/BatteryHistoryDetail.java | 4 ++-- .../fuelgauge/BatterySaverSettings.java | 4 ++-- .../settings/fuelgauge/InactiveApps.java | 4 ++-- .../settings/fuelgauge/PowerUsageDetail.java | 4 ++-- .../settings/fuelgauge/PowerUsageSummary.java | 4 ++-- .../InputMethodAndLanguageSettings.java | 4 ++-- .../InputMethodAndSubtypeEnabler.java | 4 ++-- .../KeyboardLayoutPickerFragment.java | 4 ++-- .../KeyboardLayoutPickerFragment2.java | 3 ++- .../inputmethod/SpellCheckersSettings.java | 4 ++-- .../UserDictionaryAddWordFragment.java | 4 ++-- .../inputmethod/UserDictionaryList.java | 4 ++-- .../settings/location/LocationMode.java | 4 ++-- .../settings/location/LocationSettings.java | 4 ++-- .../settings/location/ScanningSettings.java | 4 ++-- src/com/android/settings/nfc/AndroidBeam.java | 4 ++-- .../android/settings/nfc/PaymentSettings.java | 4 ++-- .../notification/AppNotificationSettings.java | 5 +++-- .../NotificationAccessSettings.java | 4 ++-- .../notification/NotificationStation.java | 4 ++-- .../notification/OtherSoundSettings.java | 4 ++-- .../notification/RedactionInterstitial.java | 4 ++-- .../TopicNotificationSettings.java | 4 ++-- .../notification/ZenAccessSettings.java | 4 ++-- .../ZenModeAutomationSettings.java | 9 +++++---- .../ZenModeEventRuleSettings.java | 4 ++-- .../notification/ZenModePrioritySettings.java | 13 ++++++------ .../notification/ZenModeRuleSettingsBase.java | 7 ++++--- .../ZenModeScheduleRuleSettings.java | 4 ++-- .../notification/ZenModeSettings.java | 4 ++-- .../ZenModeVisualInterruptionSettings.java | 9 +++++---- .../print/PrintJobSettingsFragment.java | 4 ++-- .../print/PrintServiceSettingsFragment.java | 5 ++--- .../settings/print/PrintSettingsFragment.java | 4 ++-- src/com/android/settings/sim/SimSettings.java | 4 ++-- .../settings/tts/TextToSpeechSettings.java | 4 ++-- .../tts/TtsEngineSettingsFragment.java | 4 ++-- .../users/AppRestrictionsFragment.java | 4 ++-- .../settings/users/UserDetailsSettings.java | 4 ++-- .../android/settings/users/UserSettings.java | 4 ++-- .../android/settings/vpn2/VpnSettings.java | 4 ++-- .../settings/wfd/WifiDisplaySettings.java | 4 ++-- .../settings/wifi/AdvancedWifiSettings.java | 4 ++-- .../wifi/SavedAccessPointsWifiSettings.java | 4 ++-- .../android/settings/wifi/WifiEnabler.java | 3 ++- .../android/settings/wifi/WifiSettings.java | 13 ++++++------ .../settings/wifi/p2p/WifiP2pSettings.java | 4 ++-- 143 files changed, 328 insertions(+), 314 deletions(-) diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java index 6cc0d606dd2..950d52a04b5 100644 --- a/src/com/android/settings/AirplaneModeEnabler.java +++ b/src/com/android/settings/AirplaneModeEnabler.java @@ -28,6 +28,7 @@ import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.Preference; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneStateIntentReceiver; import com.android.internal.telephony.TelephonyProperties; import com.android.settingslib.WirelessUtils; @@ -122,7 +123,7 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene // In ECM mode, do not update database at this point } else { Boolean value = (Boolean) newValue; - MetricsLogger.action(mContext, MetricsLogger.ACTION_AIRPLANE_TOGGLE, value); + MetricsLogger.action(mContext, MetricsEvent.ACTION_AIRPLANE_TOGGLE, value); setAirplaneModeOn(value); } return true; diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java index 20fb9eae09e..c0b6e00a4b5 100644 --- a/src/com/android/settings/ApnEditor.java +++ b/src/com/android/settings/ApnEditor.java @@ -41,7 +41,7 @@ import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import java.util.HashSet; import java.util.Set; @@ -255,7 +255,7 @@ public class ApnEditor extends InstrumentedPreferenceActivity @Override protected int getMetricsCategory() { - return MetricsLogger.APN_EDITOR; + return MetricsEvent.APN_EDITOR; } @Override diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java index 273e32c6cd8..1b4dc1abf43 100644 --- a/src/com/android/settings/ApnSettings.java +++ b/src/com/android/settings/ApnSettings.java @@ -51,7 +51,7 @@ import android.view.MenuItem; 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.telephony.PhoneConstants; import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.dataconnection.ApnSetting; @@ -144,7 +144,7 @@ public class ApnSettings extends SettingsPreferenceFragment implements @Override protected int getMetricsCategory() { - return MetricsLogger.APN; + return MetricsEvent.APN; } @Override diff --git a/src/com/android/settings/ApplicationSettings.java b/src/com/android/settings/ApplicationSettings.java index 486b8c0ea4c..759cceacd25 100644 --- a/src/com/android/settings/ApplicationSettings.java +++ b/src/com/android/settings/ApplicationSettings.java @@ -24,7 +24,7 @@ import android.support.v7.preference.ListPreference; import android.support.v7.preference.Preference; import android.support.v7.preference.Preference.OnPreferenceChangeListener; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; public class ApplicationSettings extends SettingsPreferenceFragment { @@ -35,7 +35,7 @@ public class ApplicationSettings extends SettingsPreferenceFragment { private static final int APP_INSTALL_AUTO = 0; private static final int APP_INSTALL_DEVICE = 1; private static final int APP_INSTALL_SDCARD = 2; - + private static final String APP_INSTALL_DEVICE_ID = "device"; private static final String APP_INSTALL_SDCARD_ID = "sdcard"; private static final String APP_INSTALL_AUTO_ID = "auto"; @@ -45,7 +45,7 @@ public class ApplicationSettings extends SettingsPreferenceFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.APPLICATION; + return MetricsEvent.APPLICATION; } @Override diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index 5f587a973fd..b44ee48f0ea 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -43,7 +43,7 @@ import android.view.View; import android.view.accessibility.AccessibilityManager; import android.widget.Toast; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreference; @@ -130,7 +130,7 @@ public class ChooseLockGeneric extends SettingsActivity { @Override protected int getMetricsCategory() { - return MetricsLogger.CHOOSE_LOCK_GENERIC; + return MetricsEvent.CHOOSE_LOCK_GENERIC; } @Override diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java index 86b6a5251b9..2fd012e311a 100644 --- a/src/com/android/settings/ChooseLockPassword.java +++ b/src/com/android/settings/ChooseLockPassword.java @@ -43,7 +43,7 @@ import android.widget.Button; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils.RequestThrottledException; import com.android.internal.widget.PasswordEntryKeyboardHelper; @@ -349,7 +349,7 @@ public class ChooseLockPassword extends SettingsActivity { @Override protected int getMetricsCategory() { - return MetricsLogger.CHOOSE_LOCK_PASSWORD; + return MetricsEvent.CHOOSE_LOCK_PASSWORD; } @Override diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java index dbbe08cf937..960ec1a0c85 100644 --- a/src/com/android/settings/ChooseLockPattern.java +++ b/src/com/android/settings/ChooseLockPattern.java @@ -29,7 +29,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient; import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils.RequestThrottledException; @@ -237,7 +237,7 @@ public class ChooseLockPattern extends SettingsActivity { @Override protected int getMetricsCategory() { - return MetricsLogger.CHOOSE_LOCK_PATTERN; + return MetricsEvent.CHOOSE_LOCK_PATTERN; } diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java index e1362ea1ce3..8f832210707 100644 --- a/src/com/android/settings/ConfirmLockPassword.java +++ b/src/com/android/settings/ConfirmLockPassword.java @@ -41,7 +41,7 @@ import android.view.inputmethod.InputMethodManager; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternChecker; import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.TextViewInputDisabler; @@ -242,7 +242,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { @Override protected int getMetricsCategory() { - return MetricsLogger.CONFIRM_LOCK_PASSWORD; + return MetricsEvent.CONFIRM_LOCK_PASSWORD; } @Override diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java index 922d1c72cd2..d4b09025693 100644 --- a/src/com/android/settings/ConfirmLockPattern.java +++ b/src/com/android/settings/ConfirmLockPattern.java @@ -32,7 +32,7 @@ import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient; import com.android.internal.widget.LockPatternChecker; import com.android.internal.widget.LockPatternUtils; @@ -200,7 +200,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { @Override protected int getMetricsCategory() { - return MetricsLogger.CONFIRM_LOCK_PATTERN; + return MetricsEvent.CONFIRM_LOCK_PATTERN; } @Override diff --git a/src/com/android/settings/CryptKeeperConfirm.java b/src/com/android/settings/CryptKeeperConfirm.java index c2dde20a601..25b92a6099b 100644 --- a/src/com/android/settings/CryptKeeperConfirm.java +++ b/src/com/android/settings/CryptKeeperConfirm.java @@ -33,7 +33,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import java.util.Locale; @@ -44,7 +44,7 @@ public class CryptKeeperConfirm extends InstrumentedFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.CRYPT_KEEPER_CONFIRM; + return MetricsEvent.CRYPT_KEEPER_CONFIRM; } public static class Blank extends Activity { diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java index b12aabb2d62..bef4cc0fb17 100644 --- a/src/com/android/settings/CryptKeeperSettings.java +++ b/src/com/android/settings/CryptKeeperSettings.java @@ -35,7 +35,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; public class CryptKeeperSettings extends InstrumentedFragment { private static final String TAG = "CryptKeeper"; @@ -116,7 +116,7 @@ public class CryptKeeperSettings extends InstrumentedFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.CRYPT_KEEPER; + return MetricsEvent.CRYPT_KEEPER; } @Override diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java index 6602c3e4e1e..a67ef720d1f 100644 --- a/src/com/android/settings/DateTimeSettings.java +++ b/src/com/android/settings/DateTimeSettings.java @@ -37,7 +37,7 @@ import android.text.format.DateFormat; import android.widget.DatePicker; import android.widget.TimePicker; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.dashboard.SummaryLoader; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; @@ -77,7 +77,7 @@ public class DateTimeSettings extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.DATE_TIME; + return MetricsEvent.DATE_TIME; } @Override diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index e38efd031f8..37e234fd502 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -79,7 +79,7 @@ import android.widget.TextView; import android.widget.Toast; import com.android.internal.app.LocalePicker; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.applications.BackgroundCheckSummary; import com.android.settings.fuelgauge.InactiveApps; import com.android.settings.search.BaseSearchIndexProvider; @@ -307,7 +307,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.DEVELOPMENT; + return MetricsEvent.DEVELOPMENT; } @Override diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index 05bcec184d6..2e74fdd10e9 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -36,7 +36,7 @@ import android.text.TextUtils; import android.util.Log; import android.widget.Toast; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Index; @@ -85,7 +85,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In @Override protected int getMetricsCategory() { - return MetricsLogger.DEVICEINFO; + return MetricsEvent.DEVICEINFO; } @Override @@ -435,4 +435,3 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In }; } - diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index 0885b13ad80..31e8d89f0f5 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -42,6 +42,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.internal.view.RotationPolicy; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.search.BaseSearchIndexProvider; @@ -100,7 +101,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements @Override protected int getMetricsCategory() { - return MetricsLogger.DISPLAY; + return MetricsEvent.DISPLAY; } @Override @@ -196,7 +197,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements @Override public boolean onPreferenceChange(Preference preference, Object newValue) { final boolean locked = Integer.parseInt((String) newValue) != 0; - MetricsLogger.action(getActivity(), MetricsLogger.ACTION_ROTATION_LOCK, + MetricsLogger.action(getActivity(), MetricsEvent.ACTION_ROTATION_LOCK, locked); RotationPolicy.setRotationLock(activity, locked); return true; diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java index a5bfa5deed7..958baa8a996 100644 --- a/src/com/android/settings/DreamSettings.java +++ b/src/com/android/settings/DreamSettings.java @@ -41,7 +41,7 @@ import android.widget.RadioButton; import android.widget.Switch; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.widget.SwitchBar; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.dream.DreamBackend.DreamInfo; @@ -77,7 +77,7 @@ public class DreamSettings extends SettingsPreferenceFragment implements @Override protected int getMetricsCategory() { - return MetricsLogger.DREAM; + return MetricsEvent.DREAM; } @Override diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java index be75c87b964..b237813eb9a 100644 --- a/src/com/android/settings/EncryptionInterstitial.java +++ b/src/com/android/settings/EncryptionInterstitial.java @@ -35,7 +35,7 @@ import android.widget.Button; import android.widget.RadioButton; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import java.util.List; @@ -85,7 +85,7 @@ public class EncryptionInterstitial extends SettingsActivity { @Override protected int getMetricsCategory() { - return MetricsLogger.ENCRYPTION; + return MetricsEvent.ENCRYPTION; } @Override diff --git a/src/com/android/settings/HomeSettings.java b/src/com/android/settings/HomeSettings.java index 145dec9cc4c..28b5484f6bf 100644 --- a/src/com/android/settings/HomeSettings.java +++ b/src/com/android/settings/HomeSettings.java @@ -50,7 +50,7 @@ import android.view.View.OnClickListener; import android.widget.ImageView; import android.widget.RadioButton; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Index; import com.android.settings.search.Indexable; @@ -246,7 +246,7 @@ public class HomeSettings extends SettingsPreferenceFragment implements Indexabl @Override protected int getMetricsCategory() { - return MetricsLogger.HOME; + return MetricsEvent.HOME; } @Override diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java index 12439563224..1a9784b7646 100644 --- a/src/com/android/settings/IccLockSettings.java +++ b/src/com/android/settings/IccLockSettings.java @@ -41,7 +41,7 @@ import android.widget.TabHost.TabSpec; import android.widget.TabWidget; import android.widget.Toast; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneFactory; import com.android.internal.telephony.TelephonyIntents; @@ -241,7 +241,7 @@ public class IccLockSettings extends InstrumentedPreferenceActivity @Override protected int getMetricsCategory() { - return MetricsLogger.ICC_LOCK; + return MetricsEvent.ICC_LOCK; } @Override diff --git a/src/com/android/settings/InstrumentedActivity.java b/src/com/android/settings/InstrumentedActivity.java index e302ca11f12..e4be6eaeff0 100644 --- a/src/com/android/settings/InstrumentedActivity.java +++ b/src/com/android/settings/InstrumentedActivity.java @@ -27,7 +27,7 @@ public abstract class InstrumentedActivity extends Activity { /** * Declare the view of this category. * - * Categories are defined in {@link com.android.internal.logging.MetricsLogger} + * Categories are defined in {@link com.android.internal.logging.MetricsProto.MetricsEvent} * or if there is no relevant existing category you may define one in * {@link com.android.settings.InstrumentedFragment}. */ diff --git a/src/com/android/settings/InstrumentedFragment.java b/src/com/android/settings/InstrumentedFragment.java index 884e07b35c2..db14a9cff3a 100644 --- a/src/com/android/settings/InstrumentedFragment.java +++ b/src/com/android/settings/InstrumentedFragment.java @@ -47,7 +47,7 @@ public abstract class InstrumentedFragment extends PreferenceFragment { /** * Declare the view of this category. * - * Categories are defined in {@link com.android.internal.logging.MetricsLogger} + * Categories are defined in {@link com.android.internal.logging.MetricsProto.MetricsEvent} * or if there is no relevant existing category you may define one in * {@link com.android.settings.InstrumentedFragment}. */ diff --git a/src/com/android/settings/InstrumentedPreferenceActivity.java b/src/com/android/settings/InstrumentedPreferenceActivity.java index 93f5dd366eb..3b19b332b38 100644 --- a/src/com/android/settings/InstrumentedPreferenceActivity.java +++ b/src/com/android/settings/InstrumentedPreferenceActivity.java @@ -25,7 +25,7 @@ public abstract class InstrumentedPreferenceActivity extends PreferenceActivity /** * Declare the view of this category. * - * Categories are defined in {@link com.android.internal.logging.MetricsLogger} + * Categories are defined in {@link com.android.internal.logging.MetricsProto.MetricsEvent} * or if there is no relevant existing category you may define one in * {@link com.android.settings.InstrumentedFragment}. */ diff --git a/src/com/android/settings/InstrumentedPreferenceFragment.java b/src/com/android/settings/InstrumentedPreferenceFragment.java index 252c89984ad..243e0bcced5 100644 --- a/src/com/android/settings/InstrumentedPreferenceFragment.java +++ b/src/com/android/settings/InstrumentedPreferenceFragment.java @@ -27,7 +27,7 @@ public abstract class InstrumentedPreferenceFragment extends PreferenceFragment /** * Declare the view of this category. * - * Categories are defined in {@link com.android.internal.logging.MetricsLogger} + * Categories are defined in {@link com.android.internal.logging.MetricsProto.MetricsEvent} * or if there is no relevant existing category you may define one in * {@link com.android.settings.InstrumentedFragment}. */ diff --git a/src/com/android/settings/LegalSettings.java b/src/com/android/settings/LegalSettings.java index 29e8275177d..d7323b91663 100644 --- a/src/com/android/settings/LegalSettings.java +++ b/src/com/android/settings/LegalSettings.java @@ -26,7 +26,7 @@ import android.os.Bundle; import android.provider.SearchIndexableResource; import android.support.v7.preference.PreferenceGroup; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -60,7 +60,7 @@ public class LegalSettings extends SettingsPreferenceFragment implements Indexab @Override protected int getMetricsCategory() { - return MetricsLogger.ABOUT_LEGAL_SETTINGS; + return MetricsEvent.ABOUT_LEGAL_SETTINGS; } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java index 8474b4503b3..5e8baac37f4 100644 --- a/src/com/android/settings/MasterClear.java +++ b/src/com/android/settings/MasterClear.java @@ -40,7 +40,7 @@ import android.widget.CheckBox; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import java.util.List; @@ -294,6 +294,6 @@ public class MasterClear extends InstrumentedFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.MASTER_CLEAR; + return MetricsEvent.MASTER_CLEAR; } } diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java index fb5c94c3558..697c5c9898e 100644 --- a/src/com/android/settings/MasterClearConfirm.java +++ b/src/com/android/settings/MasterClearConfirm.java @@ -31,7 +31,7 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; /** * Confirm and execute a reset of the device to a clean "just out of the box" @@ -168,6 +168,6 @@ public class MasterClearConfirm extends InstrumentedFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.MASTER_CLEAR_CONFIRM; + return MetricsEvent.MASTER_CLEAR_CONFIRM; } } diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java index df73fecd969..a0b074bf059 100644 --- a/src/com/android/settings/PrivacySettings.java +++ b/src/com/android/settings/PrivacySettings.java @@ -34,7 +34,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener; import android.support.v7.preference.PreferenceScreen; import android.util.Log; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -70,7 +70,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index @Override protected int getMetricsCategory() { - return MetricsLogger.PRIVACY; + return MetricsEvent.PRIVACY; } @Override diff --git a/src/com/android/settings/ProfileChallengePreferenceFragment.java b/src/com/android/settings/ProfileChallengePreferenceFragment.java index bd8a7b78292..4c654418e61 100644 --- a/src/com/android/settings/ProfileChallengePreferenceFragment.java +++ b/src/com/android/settings/ProfileChallengePreferenceFragment.java @@ -41,7 +41,7 @@ import android.support.v7.preference.PreferenceCategory; import android.support.v7.preference.PreferenceGroup; import android.support.v7.preference.PreferenceScreen; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.fingerprint.FingerprintEnrollIntroduction; import com.android.settings.fingerprint.FingerprintSettings; @@ -90,7 +90,7 @@ public class ProfileChallengePreferenceFragment extends SettingsPreferenceFragme @Override protected int getMetricsCategory() { - return MetricsLogger.PROFILE_CHALLENGE; + return MetricsEvent.PROFILE_CHALLENGE; } @Override diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java index 9ec5b27dc2f..35242bc89d6 100644 --- a/src/com/android/settings/ProxySelector.java +++ b/src/com/android/settings/ProxySelector.java @@ -39,7 +39,7 @@ import android.widget.Button; import android.widget.EditText; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment; public class ProxySelector extends InstrumentedFragment implements DialogCreatable { @@ -273,6 +273,6 @@ public class ProxySelector extends InstrumentedFragment implements DialogCreatab @Override protected int getMetricsCategory() { - return MetricsLogger.PROXY_SELECTOR; + return MetricsEvent.PROXY_SELECTOR; } } diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java index aba53824ce7..18bd4f0fd53 100644 --- a/src/com/android/settings/ResetNetwork.java +++ b/src/com/android/settings/ResetNetwork.java @@ -31,7 +31,7 @@ import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.Spinner; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; import java.util.ArrayList; @@ -193,6 +193,6 @@ public class ResetNetwork extends InstrumentedFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.RESET_NETWORK; + return MetricsEvent.RESET_NETWORK; } } diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java index 4615a9971c1..ad98babf0f5 100644 --- a/src/com/android/settings/ResetNetworkConfirm.java +++ b/src/com/android/settings/ResetNetworkConfirm.java @@ -32,7 +32,7 @@ import android.widget.Button; import android.widget.Toast; import com.android.ims.ImsManager; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; /** @@ -135,6 +135,6 @@ public class ResetNetworkConfirm extends InstrumentedFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.RESET_NETWORK_CONFIRM; + return MetricsEvent.RESET_NETWORK_CONFIRM; } } diff --git a/src/com/android/settings/ScreenPinningSettings.java b/src/com/android/settings/ScreenPinningSettings.java index 70312717b93..d8e821c8400 100644 --- a/src/com/android/settings/ScreenPinningSettings.java +++ b/src/com/android/settings/ScreenPinningSettings.java @@ -30,7 +30,7 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.Switch; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -55,7 +55,7 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.SCREEN_PINNING; + return MetricsEvent.SCREEN_PINNING; } @Override diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 0a11693b727..415f4d37c76 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -51,7 +51,7 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.RestrictedListPreference; import com.android.settings.TrustAgentUtils.TrustAgentComponentInfo; @@ -149,7 +149,7 @@ public class SecuritySettings extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.SECURITY; + return MetricsEvent.SECURITY; } @Override diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java index 4b5f23d26af..793a636e326 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -39,7 +39,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.wifi.WifiApDialog; import com.android.settings.wifi.WifiApEnabler; import com.android.settingslib.TetherUtil; @@ -109,7 +109,7 @@ public class TetherSettings extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.TETHER; + return MetricsEvent.TETHER; } @Override diff --git a/src/com/android/settings/TrustAgentSettings.java b/src/com/android/settings/TrustAgentSettings.java index d0a25b97f8a..a2f14e5c562 100644 --- a/src/com/android/settings/TrustAgentSettings.java +++ b/src/com/android/settings/TrustAgentSettings.java @@ -32,7 +32,7 @@ import android.support.v7.preference.PreferenceGroup; import android.util.ArrayMap; import android.util.ArraySet; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import java.util.List; @@ -67,7 +67,7 @@ public class TrustAgentSettings extends SettingsPreferenceFragment implements @Override protected int getMetricsCategory() { - return MetricsLogger.TRUST_AGENT; + return MetricsEvent.TRUST_AGENT; } @Override diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java index 77fc322832d..cb2259f505b 100644 --- a/src/com/android/settings/TrustedCredentialsSettings.java +++ b/src/com/android/settings/TrustedCredentialsSettings.java @@ -50,7 +50,7 @@ import android.widget.Switch; import android.widget.TabHost; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.util.ParcelableString; import java.security.cert.CertificateEncodingException; @@ -70,7 +70,7 @@ public class TrustedCredentialsSettings extends InstrumentedFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.TRUSTED_CREDENTIALS; + return MetricsEvent.TRUSTED_CREDENTIALS; } private enum Tab { diff --git a/src/com/android/settings/WallpaperTypeSettings.java b/src/com/android/settings/WallpaperTypeSettings.java index 77bb532f9ec..d7ae5ef1bc9 100644 --- a/src/com/android/settings/WallpaperTypeSettings.java +++ b/src/com/android/settings/WallpaperTypeSettings.java @@ -25,7 +25,7 @@ import android.os.Bundle; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settings.search.SearchIndexableRaw; @@ -37,7 +37,7 @@ public class WallpaperTypeSettings extends SettingsPreferenceFragment implements @Override protected int getMetricsCategory() { - return MetricsLogger.WALLPAPER_TYPE; + return MetricsEvent.WALLPAPER_TYPE; } @Override diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java index 1a0def6b836..da83cad0a3c 100644 --- a/src/com/android/settings/WifiCallingSettings.java +++ b/src/com/android/settings/WifiCallingSettings.java @@ -37,6 +37,7 @@ import android.widget.TextView; import com.android.ims.ImsConfig; import com.android.ims.ImsManager; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.telephony.Phone; import com.android.settings.widget.SwitchBar; @@ -150,7 +151,7 @@ public class WifiCallingSettings extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.WIFI_CALLING; + return MetricsEvent.WIFI_CALLING; } @Override diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index 36cd346ee4a..061d0591c9d 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -45,7 +45,7 @@ import android.text.TextUtils; import android.util.Log; import com.android.ims.ImsManager; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.TelephonyProperties; import com.android.settings.nfc.NfcEnabler; @@ -205,7 +205,7 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde @Override protected int getMetricsCategory() { - return MetricsLogger.WIRELESS; + return MetricsEvent.WIRELESS; } @Override diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index 411256cbfee..1ca32d84974 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -41,8 +41,9 @@ import android.text.TextUtils; import android.view.KeyCharacterMap; import android.view.KeyEvent; import android.view.accessibility.AccessibilityManager; + import com.android.internal.content.PackageMonitor; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.view.RotationPolicy; import com.android.internal.view.RotationPolicy.RotationPolicyListener; import com.android.settings.DialogCreatable; @@ -52,8 +53,9 @@ import com.android.settings.Utils; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settings.search.SearchIndexableRaw; -import com.android.settingslib.RestrictedPreference; import com.android.settingslib.RestrictedLockUtils; +import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; +import com.android.settingslib.RestrictedPreference; import com.android.settingslib.accessibility.AccessibilityUtils; import java.util.ArrayList; @@ -63,8 +65,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - /** * Activity with the accessibility settings. */ @@ -207,7 +207,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements @Override protected int getMetricsCategory() { - return MetricsLogger.ACCESSIBILITY; + return MetricsEvent.ACCESSIBILITY; } @Override diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java index 6a984ac1266..052f6fb4e62 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java @@ -27,7 +27,7 @@ import android.provider.Settings; import android.support.v7.preference.Preference; import android.view.accessibility.AccessibilityManager; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto; import com.android.settings.DialogCreatable; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -55,7 +55,7 @@ public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragm @Override protected int getMetricsCategory() { - return MetricsLogger.ACCESSIBILITY; + return MetricsProto.MetricsEvent.ACCESSIBILITY; } @Override diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java index 83f3ecbc124..db8a10b1e95 100644 --- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java +++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java @@ -35,7 +35,7 @@ import android.view.ViewGroup.LayoutParams; import android.view.accessibility.CaptioningManager; import android.view.accessibility.CaptioningManager.CaptionStyle; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.widget.SubtitleView; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -98,7 +98,7 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.ACCESSIBILITY_CAPTION_PROPERTIES; + return MetricsEvent.ACCESSIBILITY_CAPTION_PROPERTIES; } @Override diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java index c19e220b376..355031d53db 100644 --- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java @@ -41,7 +41,7 @@ import android.widget.LinearLayout; 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.widget.LockPatternUtils; import com.android.settings.ConfirmDeviceCredentialActivity; import com.android.settings.R; @@ -75,7 +75,7 @@ public class ToggleAccessibilityServicePreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.ACCESSIBILITY_SERVICE; + return MetricsEvent.ACCESSIBILITY_SERVICE; } @Override diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java index 2f4e3b5cf61..6b4aece40d3 100644 --- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java @@ -24,7 +24,7 @@ import android.view.View; import android.view.accessibility.AccessibilityManager; import android.widget.Switch; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.widget.SwitchBar; @@ -38,7 +38,7 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF @Override protected int getMetricsCategory() { - return MetricsLogger.ACCESSIBILITY_TOGGLE_DALTONIZER; + return MetricsEvent.ACCESSIBILITY_TOGGLE_DALTONIZER; } @Override diff --git a/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java index 740f8c6db4b..23811bbcbeb 100644 --- a/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java @@ -18,7 +18,7 @@ package com.android.settings.accessibility; import android.provider.Settings; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.widget.ToggleSwitch; import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener; @@ -46,6 +46,6 @@ public class ToggleGlobalGesturePreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE; + return MetricsEvent.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE; } } diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java index 45af2de3a1d..80719b29dd3 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java @@ -16,10 +16,9 @@ package com.android.settings.accessibility; -import android.os.Bundle; import android.provider.Settings; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.widget.ToggleSwitch; import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener; @@ -71,6 +70,6 @@ public class ToggleScreenMagnificationPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION; + return MetricsEvent.ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION; } } diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java index c8e0322b577..03163f1eabf 100644 --- a/src/com/android/settings/accounts/AccountSettings.java +++ b/src/com/android/settings/accounts/AccountSettings.java @@ -41,8 +41,8 @@ import android.os.UserManager; import android.provider.SearchIndexableResource; import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.Preference; -import android.support.v7.preference.Preference.OnPreferenceClickListener; import android.support.v7.preference.Preference.OnPreferenceChangeListener; +import android.support.v7.preference.Preference.OnPreferenceClickListener; import android.support.v7.preference.PreferenceGroup; import android.support.v7.preference.PreferenceScreen; import android.util.Log; @@ -51,7 +51,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.AccessiblePreferenceCategory; import com.android.settings.DimmableIconPreference; import com.android.settings.R; @@ -135,7 +135,7 @@ public class AccountSettings extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.ACCOUNT; + return MetricsEvent.ACCOUNT; } @Override diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java index 8471dbaafad..418fd58348d 100644 --- a/src/com/android/settings/accounts/AccountSyncSettings.java +++ b/src/com/android/settings/accounts/AccountSyncSettings.java @@ -28,13 +28,11 @@ import android.app.Dialog; import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; -import android.content.Intent; import android.content.SyncAdapterType; import android.content.SyncInfo; import android.content.SyncStatusInfo; import android.content.pm.ProviderInfo; import android.content.pm.UserInfo; -import android.graphics.Color; import android.os.Binder; import android.os.Bundle; import android.os.UserHandle; @@ -49,15 +47,14 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import android.widget.ListView; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.google.android.collect.Lists; + +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; -import com.android.settings.ShowAdminSupportDetailsDialog; import com.android.settings.Utils; import com.android.settingslib.RestrictedLockUtils; -import com.google.android.collect.Lists; import java.io.IOException; import java.util.ArrayList; @@ -149,7 +146,7 @@ public class AccountSyncSettings extends AccountPreferenceBase { @Override protected int getMetricsCategory() { - return MetricsLogger.ACCOUNTS_ACCOUNT_SYNC; + return MetricsEvent.ACCOUNTS_ACCOUNT_SYNC; } @Override diff --git a/src/com/android/settings/accounts/ChooseAccountActivity.java b/src/com/android/settings/accounts/ChooseAccountActivity.java index 489a165b0e9..80017cdae8d 100644 --- a/src/com/android/settings/accounts/ChooseAccountActivity.java +++ b/src/com/android/settings/accounts/ChooseAccountActivity.java @@ -32,12 +32,13 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceGroup; import android.util.Log; -import com.android.internal.logging.MetricsLogger; +import com.google.android.collect.Maps; + +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.util.CharSequences; import com.android.settings.InstrumentedPreferenceActivity; import com.android.settings.R; import com.android.settings.Utils; -import com.google.android.collect.Maps; import java.util.ArrayList; import java.util.Collections; @@ -89,7 +90,7 @@ public class ChooseAccountActivity extends InstrumentedPreferenceActivity { @Override protected int getMetricsCategory() { - return MetricsLogger.ACCOUNTS_CHOOSE_ACCOUNT_ACTIVITY; + return MetricsEvent.ACCOUNTS_CHOOSE_ACCOUNT_ACTIVITY; } @Override diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java index d2f9174a7ec..80d6bc14593 100644 --- a/src/com/android/settings/accounts/ManageAccountsSettings.java +++ b/src/com/android/settings/accounts/ManageAccountsSettings.java @@ -45,7 +45,8 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; + +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.AccountPreference; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -88,7 +89,7 @@ public class ManageAccountsSettings extends AccountPreferenceBase @Override protected int getMetricsCategory() { - return MetricsLogger.ACCOUNTS_MANAGE_ACCOUNTS; + return MetricsEvent.ACCOUNTS_MANAGE_ACCOUNTS; } @Override diff --git a/src/com/android/settings/applications/AdvancedAppSettings.java b/src/com/android/settings/applications/AdvancedAppSettings.java index ed266c9a875..50f9a5bb6e6 100644 --- a/src/com/android/settings/applications/AdvancedAppSettings.java +++ b/src/com/android/settings/applications/AdvancedAppSettings.java @@ -21,7 +21,7 @@ import android.os.AsyncTask; import android.os.Bundle; import android.support.v7.preference.Preference; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.PermissionsSummaryHelper.PermissionsResultCallback; @@ -72,7 +72,7 @@ public class AdvancedAppSettings extends SettingsPreferenceFragment implements @Override protected int getMetricsCategory() { - return MetricsLogger.APPLICATIONS_ADVANCED; + return MetricsEvent.APPLICATIONS_ADVANCED; } @Override diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java index 91523ee6e5a..8f687217e56 100644 --- a/src/com/android/settings/applications/AppLaunchSettings.java +++ b/src/com/android/settings/applications/AppLaunchSettings.java @@ -34,7 +34,7 @@ import android.util.Log; import android.view.View; import android.view.View.OnClickListener; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; @@ -213,6 +213,6 @@ public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListe @Override protected int getMetricsCategory() { - return MetricsLogger.APPLICATIONS_APP_LAUNCH; + return MetricsEvent.APPLICATIONS_APP_LAUNCH; } } diff --git a/src/com/android/settings/applications/AppOpsDetails.java b/src/com/android/settings/applications/AppOpsDetails.java index 7e9270ad360..0a953c00532 100644 --- a/src/com/android/settings/applications/AppOpsDetails.java +++ b/src/com/android/settings/applications/AppOpsDetails.java @@ -38,7 +38,7 @@ import android.widget.LinearLayout; import android.widget.Switch; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.InstrumentedFragment; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -181,7 +181,7 @@ public class AppOpsDetails extends InstrumentedFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.APP_OPS_DETAILS; + return MetricsEvent.APP_OPS_DETAILS; } @Override diff --git a/src/com/android/settings/applications/AppOpsSummary.java b/src/com/android/settings/applications/AppOpsSummary.java index 782b8fb42dd..7a2881cac77 100644 --- a/src/com/android/settings/applications/AppOpsSummary.java +++ b/src/com/android/settings/applications/AppOpsSummary.java @@ -28,7 +28,7 @@ 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.settings.InstrumentedFragment; import com.android.settings.R; @@ -53,7 +53,7 @@ public class AppOpsSummary extends InstrumentedFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.APP_OPS_SUMMARY; + return MetricsEvent.APP_OPS_SUMMARY; } class MyPagerAdapter extends FragmentPagerAdapter implements ViewPager.OnPageChangeListener { diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java index ae0c10adf31..2fcd40edff8 100644 --- a/src/com/android/settings/applications/AppStorageSettings.java +++ b/src/com/android/settings/applications/AppStorageSettings.java @@ -44,7 +44,7 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.deviceinfo.StorageWizardMoveConfirm; @@ -592,7 +592,7 @@ public class AppStorageSettings extends AppInfoWithHeader @Override protected int getMetricsCategory() { - return MetricsLogger.APPLICATIONS_APP_STORAGE; + return MetricsEvent.APPLICATIONS_APP_STORAGE; } class ClearCacheObserver extends IPackageDataObserver.Stub { diff --git a/src/com/android/settings/applications/BackgroundCheckSummary.java b/src/com/android/settings/applications/BackgroundCheckSummary.java index dfd4c496371..553eab258bf 100644 --- a/src/com/android/settings/applications/BackgroundCheckSummary.java +++ b/src/com/android/settings/applications/BackgroundCheckSummary.java @@ -29,7 +29,7 @@ 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.settings.InstrumentedFragment; import com.android.settings.R; @@ -39,7 +39,7 @@ public class BackgroundCheckSummary extends InstrumentedFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.BACKGROUND_CHECK_SUMMARY; + return MetricsEvent.BACKGROUND_CHECK_SUMMARY; } @Override diff --git a/src/com/android/settings/applications/DrawOverlayDetails.java b/src/com/android/settings/applications/DrawOverlayDetails.java index 85d3d7b1fb4..92ff4807929 100644 --- a/src/com/android/settings/applications/DrawOverlayDetails.java +++ b/src/com/android/settings/applications/DrawOverlayDetails.java @@ -31,7 +31,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener; import android.support.v7.preference.Preference.OnPreferenceClickListener; import android.util.Log; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppStateAppOpsBridge.PermissionState; import com.android.settings.applications.AppStateOverlayBridge.OverlayState; @@ -152,7 +152,7 @@ public class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenc @Override protected int getMetricsCategory() { - return MetricsLogger.SYSTEM_ALERT_WINDOW_APPS; + return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS; } public static CharSequence getSummary(Context context, AppEntry entry) { diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java index 74785962ab1..f31fa72ef3a 100755 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -64,7 +64,7 @@ import android.view.ViewGroup; import android.widget.Button; 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.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.AppHeader; @@ -290,7 +290,7 @@ public class InstalledAppDetails extends AppInfoBase @Override protected int getMetricsCategory() { - return MetricsLogger.APPLICATIONS_INSTALLED_APP_DETAILS; + return MetricsEvent.APPLICATIONS_INSTALLED_APP_DETAILS; } @Override diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java index dd63e2111ea..716dde600c5 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -46,7 +46,7 @@ import android.widget.Filterable; import android.widget.FrameLayout; import android.widget.ListView; import android.widget.Spinner; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.AppHeader; import com.android.settings.HelpUtils; import com.android.settings.InstrumentedFragment; @@ -376,23 +376,23 @@ public class ManageApplications extends InstrumentedFragment protected int getMetricsCategory() { switch (mListType) { case LIST_TYPE_MAIN: - return MetricsLogger.MANAGE_APPLICATIONS; + return MetricsEvent.MANAGE_APPLICATIONS; case LIST_TYPE_NOTIFICATION: - return MetricsLogger.MANAGE_APPLICATIONS_NOTIFICATIONS; + return MetricsEvent.MANAGE_APPLICATIONS_NOTIFICATIONS; case LIST_TYPE_DOMAINS_URLS: - return MetricsLogger.MANAGE_DOMAIN_URLS; + return MetricsEvent.MANAGE_DOMAIN_URLS; case LIST_TYPE_STORAGE: - return MetricsLogger.APPLICATIONS_STORAGE_APPS; + return MetricsEvent.APPLICATIONS_STORAGE_APPS; case LIST_TYPE_USAGE_ACCESS: - return MetricsLogger.USAGE_ACCESS; + return MetricsEvent.USAGE_ACCESS; case LIST_TYPE_HIGH_POWER: - return MetricsLogger.APPLICATIONS_HIGH_POWER_APPS; + return MetricsEvent.APPLICATIONS_HIGH_POWER_APPS; case LIST_TYPE_OVERLAY: - return MetricsLogger.SYSTEM_ALERT_WINDOW_APPS; + return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS; case LIST_TYPE_WRITE_SETTINGS: - return MetricsLogger.SYSTEM_ALERT_WINDOW_APPS; + return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS; default: - return MetricsLogger.VIEW_UNKNOWN; + return MetricsEvent.VIEW_UNKNOWN; } } diff --git a/src/com/android/settings/applications/ManageAssist.java b/src/com/android/settings/applications/ManageAssist.java index fb4248d0f9c..24c558c68c9 100644 --- a/src/com/android/settings/applications/ManageAssist.java +++ b/src/com/android/settings/applications/ManageAssist.java @@ -25,7 +25,7 @@ import android.provider.Settings; import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.Preference; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.voice.VoiceInputListPreference; @@ -71,7 +71,7 @@ public class ManageAssist extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.APPLICATIONS_MANAGE_ASSIST; + return MetricsEvent.APPLICATIONS_MANAGE_ASSIST; } @Override diff --git a/src/com/android/settings/applications/ManageDefaultApps.java b/src/com/android/settings/applications/ManageDefaultApps.java index 73bf83700ae..77d268da8d4 100644 --- a/src/com/android/settings/applications/ManageDefaultApps.java +++ b/src/com/android/settings/applications/ManageDefaultApps.java @@ -31,7 +31,7 @@ import android.text.TextUtils; import android.util.Log; import com.android.internal.content.PackageMonitor; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -191,7 +191,7 @@ public class ManageDefaultApps extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.APPLICATIONS_DEFAULT_APPS; + return MetricsEvent.APPLICATIONS_DEFAULT_APPS; } @Override diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java index 4ad480ee589..252b2efb08f 100644 --- a/src/com/android/settings/applications/ProcessStatsDetail.java +++ b/src/com/android/settings/applications/ProcessStatsDetail.java @@ -40,7 +40,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.AppHeader; import com.android.settings.CancellablePreference; import com.android.settings.CancellablePreference.OnCancelListener; @@ -122,7 +122,7 @@ public class ProcessStatsDetail extends SettingsPreferenceFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.APPLICATIONS_PROCESS_STATS_DETAIL; + return MetricsEvent.APPLICATIONS_PROCESS_STATS_DETAIL; } @Override diff --git a/src/com/android/settings/applications/ProcessStatsMemDetail.java b/src/com/android/settings/applications/ProcessStatsMemDetail.java index f08dfbcb4a1..e60a36862f5 100644 --- a/src/com/android/settings/applications/ProcessStatsMemDetail.java +++ b/src/com/android/settings/applications/ProcessStatsMemDetail.java @@ -25,7 +25,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.android.internal.app.ProcessStats; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.InstrumentedFragment; import com.android.settings.R; @@ -87,7 +87,7 @@ public class ProcessStatsMemDetail extends InstrumentedFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.APPLICATIONS_PROCESS_STATS_MEM_DETAIL; + return MetricsEvent.APPLICATIONS_PROCESS_STATS_MEM_DETAIL; } @Override diff --git a/src/com/android/settings/applications/ProcessStatsSummary.java b/src/com/android/settings/applications/ProcessStatsSummary.java index 28917c85067..30701dc6660 100644 --- a/src/com/android/settings/applications/ProcessStatsSummary.java +++ b/src/com/android/settings/applications/ProcessStatsSummary.java @@ -22,7 +22,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.Preference.OnPreferenceClickListener; import android.text.format.Formatter; import android.text.format.Formatter.BytesResult; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SummaryPreference; import com.android.settings.Utils; @@ -103,7 +103,7 @@ public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenc @Override protected int getMetricsCategory() { - return MetricsLogger.PROCESS_STATS_SUMMARY; + return MetricsEvent.PROCESS_STATS_SUMMARY; } @Override diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java index 3ac77462674..b26f4a71888 100644 --- a/src/com/android/settings/applications/ProcessStatsUi.java +++ b/src/com/android/settings/applications/ProcessStatsUi.java @@ -28,7 +28,7 @@ import android.view.MenuInflater; import android.view.MenuItem; import com.android.internal.app.ProcessStats; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.applications.ProcStatsData.MemInfo; @@ -92,7 +92,7 @@ public class ProcessStatsUi extends ProcessStatsBase { @Override protected int getMetricsCategory() { - return MetricsLogger.APPLICATIONS_PROCESS_STATS_UI; + return MetricsEvent.APPLICATIONS_PROCESS_STATS_UI; } @Override diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java index 79cdfb2fb73..baf94577e89 100644 --- a/src/com/android/settings/applications/RunningServiceDetails.java +++ b/src/com/android/settings/applications/RunningServiceDetails.java @@ -32,7 +32,7 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.InstrumentedFragment; import com.android.settings.R; import com.android.settings.Utils; @@ -535,7 +535,7 @@ public class RunningServiceDetails extends InstrumentedFragment @Override protected int getMetricsCategory() { - return MetricsLogger.RUNNING_SERVICE_DETAILS; + return MetricsEvent.RUNNING_SERVICE_DETAILS; } @Override diff --git a/src/com/android/settings/applications/UsageAccessDetails.java b/src/com/android/settings/applications/UsageAccessDetails.java index 00034e6aeca..ffe99ed3033 100644 --- a/src/com/android/settings/applications/UsageAccessDetails.java +++ b/src/com/android/settings/applications/UsageAccessDetails.java @@ -33,7 +33,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener; import android.support.v7.preference.Preference.OnPreferenceClickListener; import android.util.Log; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppStateUsageBridge.UsageState; @@ -163,7 +163,7 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc @Override protected int getMetricsCategory() { - return MetricsLogger.APPLICATIONS_USAGE_ACCESS_DETAIL; + return MetricsEvent.APPLICATIONS_USAGE_ACCESS_DETAIL; } } diff --git a/src/com/android/settings/applications/WriteSettingsDetails.java b/src/com/android/settings/applications/WriteSettingsDetails.java index 6fb5dfbeaf7..a4200d71634 100644 --- a/src/com/android/settings/applications/WriteSettingsDetails.java +++ b/src/com/android/settings/applications/WriteSettingsDetails.java @@ -31,7 +31,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener; import android.support.v7.preference.Preference.OnPreferenceClickListener; import android.util.Log; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppStateAppOpsBridge.PermissionState; import com.android.settings.applications.AppStateWriteSettingsBridge.WriteSettingsState; @@ -154,7 +154,7 @@ public class WriteSettingsDetails extends AppInfoWithHeader implements OnPrefere @Override protected int getMetricsCategory() { - return MetricsLogger.SYSTEM_ALERT_WINDOW_APPS; + return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS; } public static CharSequence getSummary(Context context, AppEntry entry) { diff --git a/src/com/android/settings/backup/ToggleBackupSettingFragment.java b/src/com/android/settings/backup/ToggleBackupSettingFragment.java index e6f15c88e8a..ff409c500e9 100644 --- a/src/com/android/settings/backup/ToggleBackupSettingFragment.java +++ b/src/com/android/settings/backup/ToggleBackupSettingFragment.java @@ -16,7 +16,7 @@ import android.util.Log; import android.view.View; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; @@ -193,7 +193,7 @@ public class ToggleBackupSettingFragment extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.PRIVACY; + return MetricsEvent.PRIVACY; } /** diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java index e83f483b372..aac7053eace 100644 --- a/src/com/android/settings/bluetooth/BluetoothEnabler.java +++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java @@ -28,6 +28,7 @@ import android.widget.Switch; import android.widget.Toast; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.Index; import com.android.settings.widget.SwitchBar; @@ -185,7 +186,7 @@ public final class BluetoothEnabler implements SwitchBar.OnSwitchChangeListener switchView.setChecked(false); } - MetricsLogger.action(mContext, MetricsLogger.ACTION_BLUETOOTH_TOGGLE, isChecked); + MetricsLogger.action(mContext, MetricsEvent.ACTION_BLUETOOTH_TOGGLE, isChecked); if (mLocalAdapter != null) { mLocalAdapter.setBluetoothEnabled(isChecked); diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java index f71dd0a4949..244b5eecad1 100644 --- a/src/com/android/settings/bluetooth/BluetoothSettings.java +++ b/src/com/android/settings/bluetooth/BluetoothSettings.java @@ -40,7 +40,9 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.widget.TextView; + import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.LinkifyUtils; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -126,7 +128,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem @Override protected int getMetricsCategory() { - return MetricsLogger.BLUETOOTH; + return MetricsEvent.BLUETOOTH; } @Override @@ -222,19 +224,19 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem switch (item.getItemId()) { case MENU_ID_SCAN: if (mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON) { - MetricsLogger.action(getActivity(), MetricsLogger.ACTION_BLUETOOTH_SCAN); + MetricsLogger.action(getActivity(), MetricsEvent.ACTION_BLUETOOTH_SCAN); startScanning(); } return true; case MENU_ID_RENAME_DEVICE: - MetricsLogger.action(getActivity(), MetricsLogger.ACTION_BLUETOOTH_RENAME); + MetricsLogger.action(getActivity(), MetricsEvent.ACTION_BLUETOOTH_RENAME); new BluetoothNameDialogFragment().show( getFragmentManager(), "rename device"); return true; case MENU_ID_SHOW_RECEIVED: - MetricsLogger.action(getActivity(), MetricsLogger.ACTION_BLUETOOTH_FILES); + MetricsLogger.action(getActivity(), MetricsEvent.ACTION_BLUETOOTH_FILES); Intent intent = new Intent(BTOPP_ACTION_OPEN_RECEIVED_FILES); getActivity().sendBroadcast(intent); return true; diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java index a1693feedc0..09481ce203b 100644 --- a/src/com/android/settings/bluetooth/DevicePickerFragment.java +++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java @@ -27,7 +27,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settingslib.bluetooth.CachedBluetoothDevice; @@ -86,7 +86,7 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.BLUETOOTH_DEVICE_PICKER; + return MetricsEvent.BLUETOOTH_DEVICE_PICKER; } @Override diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java index 8dffffa934a..ba9136a95be 100644 --- a/src/com/android/settings/dashboard/DashboardSummary.java +++ b/src/com/android/settings/dashboard/DashboardSummary.java @@ -25,7 +25,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.View; import android.view.ViewGroup; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.HelpUtils; import com.android.settings.InstrumentedFragment; import com.android.settings.R; @@ -66,7 +66,7 @@ public class DashboardSummary extends InstrumentedFragment @Override protected int getMetricsCategory() { - return MetricsLogger.DASHBOARD_SUMMARY; + return MetricsEvent.DASHBOARD_SUMMARY; } @Override diff --git a/src/com/android/settings/dashboard/SearchResultsSummary.java b/src/com/android/settings/dashboard/SearchResultsSummary.java index f52ad1f1923..38f17e3ef23 100644 --- a/src/com/android/settings/dashboard/SearchResultsSummary.java +++ b/src/com/android/settings/dashboard/SearchResultsSummary.java @@ -38,6 +38,7 @@ import android.widget.SearchView; import android.widget.TextView; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.InstrumentedFragment; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -84,7 +85,7 @@ public class SearchResultsSummary extends InstrumentedFragment { @Override protected void onPostExecute(Cursor cursor) { if (!isCancelled()) { - MetricsLogger.action(getContext(), MetricsLogger.ACTION_SEARCH_RESULTS, + MetricsLogger.action(getContext(), MetricsEvent.ACTION_SEARCH_RESULTS, cursor.getCount()); setResultsCursor(cursor); setResultsVisibility(cursor.getCount() > 0); @@ -250,7 +251,7 @@ public class SearchResultsSummary extends InstrumentedFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.DASHBOARD_SEARCH_RESULTS; + return MetricsEvent.DASHBOARD_SEARCH_RESULTS; } @Override diff --git a/src/com/android/settings/datausage/CellDataPreference.java b/src/com/android/settings/datausage/CellDataPreference.java index 0a91be213de..73699d68373 100644 --- a/src/com/android/settings/datausage/CellDataPreference.java +++ b/src/com/android/settings/datausage/CellDataPreference.java @@ -31,7 +31,9 @@ import android.util.AttributeSet; import android.util.Log; import android.view.View; import android.widget.Checkable; + import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.CustomDialogPreference; import com.android.settings.R; import com.android.settings.Utils; @@ -109,7 +111,7 @@ public class CellDataPreference extends CustomDialogPreference implements Templa @Override protected void performClick(View view) { super.performClick(view); - MetricsLogger.action(getContext(), MetricsLogger.ACTION_CELL_DATA_TOGGLE, !mChecked); + MetricsLogger.action(getContext(), MetricsEvent.ACTION_CELL_DATA_TOGGLE, !mChecked); if (mChecked) { // disabling data; show confirmation dialog which eventually // calls setMobileDataEnabled() once user confirms. diff --git a/src/com/android/settings/datausage/DataUsageMeteredSettings.java b/src/com/android/settings/datausage/DataUsageMeteredSettings.java index 97907048ab0..25e1a07127a 100644 --- a/src/com/android/settings/datausage/DataUsageMeteredSettings.java +++ b/src/com/android/settings/datausage/DataUsageMeteredSettings.java @@ -27,7 +27,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceCategory; import android.telephony.TelephonyManager; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -61,7 +61,7 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment impleme @Override protected int getMetricsCategory() { - return MetricsLogger.NET_DATA_USAGE_METERED; + return MetricsEvent.NET_DATA_USAGE_METERED; } @Override diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java index f9c9ba65827..e1936ed3226 100644 --- a/src/com/android/settings/datausage/DataUsageSummary.java +++ b/src/com/android/settings/datausage/DataUsageSummary.java @@ -35,7 +35,7 @@ import android.text.format.Formatter; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SummaryPreference; import com.android.settings.Utils; @@ -215,7 +215,7 @@ public class DataUsageSummary extends DataUsageBase implements Indexable { @Override protected int getMetricsCategory() { - return MetricsLogger.DATA_USAGE_SUMMARY; + return MetricsEvent.DATA_USAGE_SUMMARY; } /** diff --git a/src/com/android/settings/deviceinfo/ImeiInformation.java b/src/com/android/settings/deviceinfo/ImeiInformation.java index d1fccd0c0e8..6b63d5591e4 100644 --- a/src/com/android/settings/deviceinfo/ImeiInformation.java +++ b/src/com/android/settings/deviceinfo/ImeiInformation.java @@ -23,7 +23,7 @@ import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.text.TextUtils; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.PhoneFactory; @@ -152,6 +152,6 @@ public class ImeiInformation extends InstrumentedPreferenceActivity { @Override protected int getMetricsCategory() { - return MetricsLogger.DEVICEINFO_IMEI_INFORMATION; + return MetricsEvent.DEVICEINFO_IMEI_INFORMATION; } } diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java index e7b9fc3203d..5341c3c7cf3 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java @@ -33,7 +33,7 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.InstrumentedFragment; import com.android.settings.R; @@ -44,7 +44,7 @@ public class PrivateVolumeForget extends InstrumentedFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.DEVICEINFO_STORAGE; + return MetricsEvent.DEVICEINFO_STORAGE; } @Override diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java b/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java index 669f2edb20d..7620b09a4db 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java @@ -29,7 +29,7 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.InstrumentedFragment; import com.android.settings.R; @@ -39,7 +39,7 @@ public class PrivateVolumeFormat extends InstrumentedFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.DEVICEINFO_STORAGE; + return MetricsEvent.DEVICEINFO_STORAGE; } @Override diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java index 9da08b8b4f5..a19b5b8234a 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java @@ -52,7 +52,7 @@ import android.view.MenuItem; import android.view.View; import android.widget.EditText; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Settings.StorageUseActivity; import com.android.settings.SettingsPreferenceFragment; @@ -130,7 +130,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.DEVICEINFO_STORAGE; + return MetricsEvent.DEVICEINFO_STORAGE; } @Override diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java b/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java index 410db8fca6b..5a4c7b1e8b5 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java @@ -28,7 +28,7 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.InstrumentedFragment; import com.android.settings.R; import com.android.settings.deviceinfo.StorageSettings.UnmountTask; @@ -39,7 +39,7 @@ public class PrivateVolumeUnmount extends InstrumentedFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.DEVICEINFO_STORAGE; + return MetricsEvent.DEVICEINFO_STORAGE; } @Override diff --git a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java index 334e3fef3d2..eee76734896 100644 --- a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java @@ -38,7 +38,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.util.Preconditions; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -77,7 +77,7 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.DEVICEINFO_STORAGE; + return MetricsEvent.DEVICEINFO_STORAGE; } @Override diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java index 238a5c0530f..68d77afefef 100644 --- a/src/com/android/settings/deviceinfo/SimStatus.java +++ b/src/com/android/settings/deviceinfo/SimStatus.java @@ -44,7 +44,7 @@ import android.widget.TabHost.TabContentFactory; import android.widget.TabHost.TabSpec; import android.widget.TabWidget; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.telephony.DefaultPhoneNotifier; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneFactory; @@ -166,7 +166,7 @@ public class SimStatus extends InstrumentedPreferenceActivity { @Override protected int getMetricsCategory() { - return MetricsLogger.DEVICEINFO_SIM_STATUS; + return MetricsEvent.DEVICEINFO_SIM_STATUS; } @Override diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java index 6e0b690c0d3..41f59efb24c 100644 --- a/src/com/android/settings/deviceinfo/Status.java +++ b/src/com/android/settings/deviceinfo/Status.java @@ -35,7 +35,7 @@ import android.os.UserManager; import android.support.v7.preference.Preference; import android.text.TextUtils; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.util.ArrayUtils; import com.android.settings.InstrumentedPreferenceActivity; import com.android.settings.R; @@ -211,7 +211,7 @@ public class Status extends InstrumentedPreferenceActivity { @Override protected int getMetricsCategory() { - return MetricsLogger.DEVICEINFO_STATUS; + return MetricsEvent.DEVICEINFO_STATUS; } @Override diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java index 06c287b4bb4..5e0aaccb9ea 100644 --- a/src/com/android/settings/deviceinfo/StorageSettings.java +++ b/src/com/android/settings/deviceinfo/StorageSettings.java @@ -42,7 +42,7 @@ import android.text.format.Formatter; import android.text.format.Formatter.BytesResult; import android.util.Log; import android.widget.Toast; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.dashboard.SummaryLoader; @@ -89,7 +89,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index @Override protected int getMetricsCategory() { - return MetricsLogger.DEVICEINFO_STORAGE; + return MetricsEvent.DEVICEINFO_STORAGE; } @Override diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java index 36dfbfe4e72..7148bd5f319 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java @@ -41,7 +41,7 @@ import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.R; @@ -409,7 +409,7 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase @Override protected int getMetricsCategory() { - return MetricsLogger.FINGERPRINT_ENROLLING; + return MetricsEvent.FINGERPRINT_ENROLLING; } public static class IconTouchDialog extends DialogFragment { diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java index b85895044f3..dc2fe9e2526 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java @@ -21,7 +21,7 @@ import android.hardware.fingerprint.FingerprintManager; import android.os.Bundle; import android.os.UserHandle; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.R; import com.android.settings.fingerprint.FingerprintEnrollSidecar.Listener; @@ -195,6 +195,6 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase { @Override protected int getMetricsCategory() { - return MetricsLogger.FINGERPRINT_FIND_SENSOR; + return MetricsEvent.FINGERPRINT_FIND_SENSOR; } } diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java index 8ec4ec01aa3..7c9a237ff06 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java @@ -24,7 +24,7 @@ import android.os.UserHandle; import android.view.View; import android.widget.Button; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; /** @@ -70,6 +70,6 @@ public class FingerprintEnrollFinish extends FingerprintEnrollBase { @Override protected int getMetricsCategory() { - return MetricsLogger.FINGERPRINT_ENROLL_FINISH; + return MetricsEvent.FINGERPRINT_ENROLL_FINISH; } } diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java index 54cd21880d3..23a81bc5666 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java @@ -23,7 +23,7 @@ import android.os.Bundle; import android.os.UserHandle; import android.view.View; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.ChooseLockGeneric; import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.HelpUtils; @@ -137,6 +137,6 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase { @Override protected int getMetricsCategory() { - return MetricsLogger.FINGERPRINT_ENROLL_INTRO; + return MetricsEvent.FINGERPRINT_ENROLL_INTRO; } } diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java index 5152ebe560a..6730327d2bb 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java @@ -25,7 +25,7 @@ import android.os.CancellationSignal; import android.os.Handler; import android.os.UserHandle; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.InstrumentedFragment; @@ -155,7 +155,7 @@ public class FingerprintEnrollSidecar extends InstrumentedFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.FINGERPRINT_ENROLL_SIDECAR; + return MetricsEvent.FINGERPRINT_ENROLL_SIDECAR; } public interface Listener { diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java index f8b9c5fb888..07c0dfe4eb5 100644 --- a/src/com/android/settings/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/fingerprint/FingerprintSettings.java @@ -59,6 +59,7 @@ import android.widget.TextView; import android.widget.Toast; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.ChooseLockGeneric; import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.HelpUtils; @@ -271,7 +272,7 @@ public class FingerprintSettings extends SubSettings { @Override protected int getMetricsCategory() { - return MetricsLogger.FINGERPRINT; + return MetricsEvent.FINGERPRINT; } @Override @@ -589,7 +590,7 @@ public class FingerprintSettings extends SubSettings { Log.v(TAG, "rename " + name + " to " + newName); } MetricsLogger.action(getContext(), - MetricsLogger.ACTION_FINGERPRINT_RENAME, + MetricsEvent.ACTION_FINGERPRINT_RENAME, mFp.getFingerId()); FingerprintSettingsFragment parent = (FingerprintSettingsFragment) @@ -633,7 +634,7 @@ public class FingerprintSettings extends SubSettings { private void onDeleteClick(DialogInterface dialog) { if (DEBUG) Log.v(TAG, "Removing fpId=" + mFp.getFingerId()); - MetricsLogger.action(getContext(), MetricsLogger.ACTION_FINGERPRINT_DELETE, + MetricsLogger.action(getContext(), MetricsEvent.ACTION_FINGERPRINT_DELETE, mFp.getFingerId()); FingerprintSettingsFragment parent = (FingerprintSettingsFragment) getTargetFragment(); diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java index b57bb8d8695..b037c2ba41b 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java +++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java @@ -28,7 +28,7 @@ import android.os.Bundle; import android.view.View; import android.widget.Button; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SetupWizardUtils; import com.android.setupwizardlib.util.SystemBarHelper; @@ -84,7 +84,7 @@ public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling @Override protected int getMetricsCategory() { - return MetricsLogger.FINGERPRINT_ENROLLING_SETUP; + return MetricsEvent.FINGERPRINT_ENROLLING_SETUP; } public static class SkipDialog extends DialogFragment { diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java index 74a280c874a..9cf5369d1ef 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java +++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java @@ -22,7 +22,7 @@ import android.os.UserHandle; import android.view.View; import android.widget.Button; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.R; import com.android.settings.SetupWizardUtils; @@ -83,6 +83,6 @@ public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSenso @Override protected int getMetricsCategory() { - return MetricsLogger.FINGERPRINT_FIND_SENSOR_SETUP; + return MetricsEvent.FINGERPRINT_FIND_SENSOR_SETUP; } } diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java index bbd0c1a3cdf..b17ed09a020 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java +++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java @@ -23,7 +23,7 @@ import android.view.View; import android.widget.Button; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.R; import com.android.settings.SetupWizardUtils; @@ -86,6 +86,6 @@ public class SetupFingerprintEnrollFinish extends FingerprintEnrollFinish @Override protected int getMetricsCategory() { - return MetricsLogger.FINGERPRINT_ENROLL_FINISH_SETUP; + return MetricsEvent.FINGERPRINT_ENROLL_FINISH_SETUP; } } diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java index 0f0d35fe9cd..ec6d3cf6439 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java +++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java @@ -21,7 +21,7 @@ import android.content.res.Resources; import android.view.View; import android.widget.Button; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SetupChooseLockGeneric; import com.android.settings.SetupWizardUtils; @@ -79,6 +79,6 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu @Override protected int getMetricsCategory() { - return MetricsLogger.FINGERPRINT_ENROLL_INTRO_SETUP; + return MetricsEvent.FINGERPRINT_ENROLL_INTRO_SETUP; } } diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java index c9770639168..af135512331 100644 --- a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java +++ b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java @@ -23,7 +23,7 @@ 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.internal.os.BatteryStatsHelper; import com.android.settings.InstrumentedFragment; import com.android.settings.R; @@ -54,6 +54,6 @@ public class BatteryHistoryDetail extends InstrumentedFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.FUELGAUGE_BATTERY_HISTORY_DETAIL; + return MetricsEvent.FUELGAUGE_BATTERY_HISTORY_DETAIL; } } diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java index 26e7d436e2e..bd19db8080d 100644 --- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java +++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java @@ -32,7 +32,7 @@ import android.provider.Settings.Global; import android.util.Log; import android.widget.Switch; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; @@ -65,7 +65,7 @@ public class BatterySaverSettings extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.FUELGAUGE_BATTERY_SAVER; + return MetricsEvent.FUELGAUGE_BATTERY_SAVER; } @Override diff --git a/src/com/android/settings/fuelgauge/InactiveApps.java b/src/com/android/settings/fuelgauge/InactiveApps.java index 336e792bcdd..0b63aa82be4 100644 --- a/src/com/android/settings/fuelgauge/InactiveApps.java +++ b/src/com/android/settings/fuelgauge/InactiveApps.java @@ -26,7 +26,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.Preference.OnPreferenceClickListener; import android.support.v7.preference.PreferenceGroup; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -38,7 +38,7 @@ public class InactiveApps extends SettingsPreferenceFragment implements OnPrefer @Override protected int getMetricsCategory() { - return MetricsLogger.FUELGAUGE_INACTIVE_APPS; + return MetricsEvent.FUELGAUGE_INACTIVE_APPS; } @Override diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java index 6ede8cc67df..f091f6649e5 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java @@ -42,7 +42,7 @@ import android.util.Log; 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.os.BatterySipper; import com.android.internal.os.BatterySipper.DrainType; import com.android.internal.os.BatteryStatsHelper; @@ -360,7 +360,7 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi @Override protected int getMetricsCategory() { - return MetricsLogger.FUELGAUGE_POWER_USAGE_DETAIL; + return MetricsEvent.FUELGAUGE_POWER_USAGE_DETAIL; } @Override diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index 153ccd7776f..d7b6849800b 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -33,7 +33,7 @@ import android.util.TypedValue; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatterySipper.DrainType; import com.android.internal.os.PowerProfile; @@ -90,7 +90,7 @@ public class PowerUsageSummary extends PowerUsageBase { @Override protected int getMetricsCategory() { - return MetricsLogger.FUELGAUGE_POWER_USAGE_SUMMARY; + return MetricsEvent.FUELGAUGE_POWER_USAGE_SUMMARY; } @Override diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java index 7564cc75259..838989e48aa 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java +++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java @@ -53,7 +53,7 @@ import android.view.textservice.TextServicesManager; import com.android.internal.app.LocaleHelper; import com.android.internal.app.LocalePicker; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Settings.KeyboardLayoutPickerActivity; import com.android.settings.SettingsActivity; @@ -109,7 +109,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.INPUTMETHOD_LANGUAGE; + return MetricsEvent.INPUTMETHOD_LANGUAGE; } @Override diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java index fd8591fd4b2..b6663184791 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java +++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java @@ -31,7 +31,7 @@ import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodSubtype; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -55,7 +55,7 @@ public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.INPUTMETHOD_SUBTYPE_ENABLER; + return MetricsEvent.INPUTMETHOD_SUBTYPE_ENABLER; } @Override diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java index ad1162e64ff..02c40147a97 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java @@ -27,7 +27,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import android.view.InputDevice; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.SettingsPreferenceFragment; import java.util.Arrays; @@ -51,7 +51,7 @@ public class KeyboardLayoutPickerFragment extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.INPUTMETHOD_KEYBOARD; + return MetricsEvent.INPUTMETHOD_KEYBOARD; } @Override diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment2.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment2.java index b5e52970357..f35d6bf16c1 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment2.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment2.java @@ -29,6 +29,7 @@ import android.view.InputDevice; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodSubtype; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.util.Preconditions; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -68,7 +69,7 @@ public final class KeyboardLayoutPickerFragment2 extends SettingsPreferenceFragm @Override protected int getMetricsCategory() { - return MetricsLogger.INPUTMETHOD_KEYBOARD; + return MetricsEvent.INPUTMETHOD_KEYBOARD; } @Override diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java index f41b3642be5..abece21796e 100644 --- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java +++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java @@ -30,7 +30,7 @@ import android.view.textservice.SpellCheckerSubtype; import android.view.textservice.TextServicesManager; import android.widget.Switch; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; @@ -56,7 +56,7 @@ public class SpellCheckersSettings extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.INPUTMETHOD_SPELL_CHECKERS; + return MetricsEvent.INPUTMETHOD_SPELL_CHECKERS; } @Override diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java index 3eb5dc6bf8d..16a347658f6 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java +++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java @@ -26,7 +26,7 @@ import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.InstrumentedFragment; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -111,7 +111,7 @@ public class UserDictionaryAddWordFragment extends InstrumentedFragment @Override protected int getMetricsCategory() { - return MetricsLogger.INPUTMETHOD_USER_DICTIONARY_ADD_WORD; + return MetricsEvent.INPUTMETHOD_USER_DICTIONARY_ADD_WORD; } @Override diff --git a/src/com/android/settings/inputmethod/UserDictionaryList.java b/src/com/android/settings/inputmethod/UserDictionaryList.java index c7e53a37154..a0ab3fc0488 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryList.java +++ b/src/com/android/settings/inputmethod/UserDictionaryList.java @@ -29,7 +29,7 @@ import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodSubtype; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; @@ -45,7 +45,7 @@ public class UserDictionaryList extends SettingsPreferenceFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.INPUTMETHOD_USER_DICTIONARY; + return MetricsEvent.INPUTMETHOD_USER_DICTIONARY; } @Override diff --git a/src/com/android/settings/location/LocationMode.java b/src/com/android/settings/location/LocationMode.java index 2bc6655c405..b2669bcc266 100644 --- a/src/com/android/settings/location/LocationMode.java +++ b/src/com/android/settings/location/LocationMode.java @@ -19,7 +19,7 @@ package com.android.settings.location; import android.provider.Settings; import android.support.v7.preference.PreferenceScreen; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; /** @@ -44,7 +44,7 @@ public class LocationMode extends LocationSettingsBase @Override protected int getMetricsCategory() { - return MetricsLogger.LOCATION_MODE; + return MetricsEvent.LOCATION_MODE; } @Override diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java index c45de1637c8..e891ebdbe79 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -37,7 +37,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.widget.Switch; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.DimmableIconPreference; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -114,7 +114,7 @@ public class LocationSettings extends LocationSettingsBase @Override protected int getMetricsCategory() { - return MetricsLogger.LOCATION; + return MetricsEvent.LOCATION; } @Override diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/ScanningSettings.java index ba2a9f791a3..863651c55cd 100644 --- a/src/com/android/settings/location/ScanningSettings.java +++ b/src/com/android/settings/location/ScanningSettings.java @@ -21,7 +21,7 @@ import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -34,7 +34,7 @@ public class ScanningSettings extends SettingsPreferenceFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.LOCATION_SCANNING; + return MetricsEvent.LOCATION_SCANNING; } @Override diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java index f1c8863e123..ef874f5590c 100644 --- a/src/com/android/settings/nfc/AndroidBeam.java +++ b/src/com/android/settings/nfc/AndroidBeam.java @@ -28,7 +28,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Switch; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.HelpUtils; import com.android.settings.InstrumentedFragment; import com.android.settings.R; @@ -113,6 +113,6 @@ public class AndroidBeam extends InstrumentedFragment @Override protected int getMetricsCategory() { - return MetricsLogger.NFC_BEAM; + return MetricsEvent.NFC_BEAM; } } diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java index dc7badf5a5c..bd131ab1ab0 100644 --- a/src/com/android/settings/nfc/PaymentSettings.java +++ b/src/com/android/settings/nfc/PaymentSettings.java @@ -29,7 +29,7 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.dashboard.SummaryLoader; @@ -43,7 +43,7 @@ public class PaymentSettings extends SettingsPreferenceFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.NFC_PAYMENT; + return MetricsEvent.NFC_PAYMENT; } @Override diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java index a5832490980..f3e95abb5d9 100644 --- a/src/com/android/settings/notification/AppNotificationSettings.java +++ b/src/com/android/settings/notification/AppNotificationSettings.java @@ -32,6 +32,7 @@ import android.util.ArrayMap; import android.util.Log; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.AppHeader; import com.android.settings.R; import com.android.settings.Utils; @@ -66,7 +67,7 @@ public class AppNotificationSettings extends NotificationSettingsBase { @Override protected int getMetricsCategory() { - return MetricsLogger.NOTIFICATION_APP_NOTIFICATION; + return MetricsEvent.NOTIFICATION_APP_NOTIFICATION; } @Override @@ -150,7 +151,7 @@ public class AppNotificationSettings extends NotificationSettingsBase { public boolean onPreferenceChange(Preference preference, Object newValue) { final boolean banned = (Boolean) newValue; if (banned) { - MetricsLogger.action(getActivity(), MetricsLogger.ACTION_BAN_APP_NOTES, mPkg); + MetricsLogger.action(getActivity(), MetricsEvent.ACTION_BAN_APP_NOTES, mPkg); } final boolean success = mBackend.setNotificationsBanned(mPkg, mUid, banned); if (success) { diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java index a5502081190..b40fbdabfdb 100644 --- a/src/com/android/settings/notification/NotificationAccessSettings.java +++ b/src/com/android/settings/notification/NotificationAccessSettings.java @@ -21,7 +21,7 @@ import android.content.pm.PackageManager; import android.provider.Settings; import android.service.notification.NotificationListenerService; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; public class NotificationAccessSettings extends ManagedServiceSettings { @@ -43,7 +43,7 @@ public class NotificationAccessSettings extends ManagedServiceSettings { @Override protected int getMetricsCategory() { - return MetricsLogger.NOTIFICATION_ACCESS; + return MetricsEvent.NOTIFICATION_ACCESS; } @Override diff --git a/src/com/android/settings/notification/NotificationStation.java b/src/com/android/settings/notification/NotificationStation.java index 6e62720152b..44f0ffcf8f4 100644 --- a/src/com/android/settings/notification/NotificationStation.java +++ b/src/com/android/settings/notification/NotificationStation.java @@ -44,7 +44,7 @@ import android.widget.DateTimeView; import android.widget.ImageView; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; @@ -137,7 +137,7 @@ public class NotificationStation extends SettingsPreferenceFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.NOTIFICATION_STATION; + return MetricsEvent.NOTIFICATION_STATION; } @Override diff --git a/src/com/android/settings/notification/OtherSoundSettings.java b/src/com/android/settings/notification/OtherSoundSettings.java index ecd98964b9d..2ea6a796040 100644 --- a/src/com/android/settings/notification/OtherSoundSettings.java +++ b/src/com/android/settings/notification/OtherSoundSettings.java @@ -31,7 +31,7 @@ import android.provider.Settings.Global; import android.provider.Settings.System; import android.telephony.TelephonyManager; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; @@ -180,7 +180,7 @@ public class OtherSoundSettings extends SettingsPreferenceFragment implements In @Override protected int getMetricsCategory() { - return MetricsLogger.NOTIFICATION_OTHER_SOUND; + return MetricsEvent.NOTIFICATION_OTHER_SOUND; } @Override diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java index 1541dfe9f86..2f871c47274 100644 --- a/src/com/android/settings/notification/RedactionInterstitial.java +++ b/src/com/android/settings/notification/RedactionInterstitial.java @@ -26,7 +26,7 @@ import android.view.ViewGroup; import android.widget.RadioButton; import android.widget.RadioGroup; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.RestrictedRadioButton; import com.android.settings.SettingsActivity; @@ -76,7 +76,7 @@ public class RedactionInterstitial extends SettingsActivity { @Override protected int getMetricsCategory() { - return MetricsLogger.NOTIFICATION_REDACTION; + return MetricsEvent.NOTIFICATION_REDACTION; } @Override diff --git a/src/com/android/settings/notification/TopicNotificationSettings.java b/src/com/android/settings/notification/TopicNotificationSettings.java index 52e7f657d5d..96104e440e2 100644 --- a/src/com/android/settings/notification/TopicNotificationSettings.java +++ b/src/com/android/settings/notification/TopicNotificationSettings.java @@ -16,7 +16,7 @@ package com.android.settings.notification; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.AppHeader; import com.android.settings.R; @@ -60,7 +60,7 @@ public class TopicNotificationSettings extends NotificationSettingsBase { @Override protected int getMetricsCategory() { - return MetricsLogger.NOTIFICATION_TOPIC_NOTIFICATION; + return MetricsEvent.NOTIFICATION_TOPIC_NOTIFICATION; } @Override diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java index 4cec0b4503d..9ff2fedd498 100644 --- a/src/com/android/settings/notification/ZenAccessSettings.java +++ b/src/com/android/settings/notification/ZenAccessSettings.java @@ -40,7 +40,7 @@ import android.support.v7.preference.PreferenceScreen; import android.text.TextUtils; import android.util.ArraySet; import android.view.View; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import java.util.ArrayList; @@ -57,7 +57,7 @@ public class ZenAccessSettings extends EmptyTextSettings { @Override protected int getMetricsCategory() { - return MetricsLogger.NOTIFICATION_ZEN_MODE_ACCESS; + return MetricsEvent.NOTIFICATION_ZEN_MODE_ACCESS; } @Override diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java index 1bdb46ab185..df19c6055b2 100644 --- a/src/com/android/settings/notification/ZenModeAutomationSettings.java +++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java @@ -40,6 +40,7 @@ import android.support.v7.preference.PreferenceViewHolder; import android.view.View; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.notification.ManagedServiceSettings.Config; @@ -106,7 +107,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase { new ZenRuleNameDialog(mContext, null) { @Override public void onOk(String ruleName) { - MetricsLogger.action(mContext, MetricsLogger.ACTION_ZEN_ADD_RULE_OK); + MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_ADD_RULE_OK); AutomaticZenRule rule = new AutomaticZenRule(ruleName, ri.serviceComponent, ri.defaultConditionId, NotificationManager.INTERRUPTION_FILTER_PRIORITY, true); @@ -126,7 +127,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase { new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - MetricsLogger.action(mContext, MetricsLogger.ACTION_ZEN_DELETE_RULE_OK); + MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_DELETE_RULE_OK); removeZenRule(ruleId); } }) @@ -169,7 +170,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase { p.setOnPreferenceClickListener(new OnPreferenceClickListener() { @Override public boolean onPreferenceClick(Preference preference) { - MetricsLogger.action(mContext, MetricsLogger.ACTION_ZEN_ADD_RULE); + MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_ADD_RULE); showAddRuleDialog(); return true; } @@ -179,7 +180,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase { @Override protected int getMetricsCategory() { - return MetricsLogger.NOTIFICATION_ZEN_MODE_AUTOMATION; + return MetricsEvent.NOTIFICATION_ZEN_MODE_AUTOMATION; } private String computeRuleSummary(AutomaticZenRule rule, boolean isSystemRule, diff --git a/src/com/android/settings/notification/ZenModeEventRuleSettings.java b/src/com/android/settings/notification/ZenModeEventRuleSettings.java index 69c870a00d7..c8efdb99eff 100644 --- a/src/com/android/settings/notification/ZenModeEventRuleSettings.java +++ b/src/com/android/settings/notification/ZenModeEventRuleSettings.java @@ -31,7 +31,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.Preference.OnPreferenceChangeListener; import android.support.v7.preference.PreferenceScreen; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import java.util.ArrayList; @@ -161,7 +161,7 @@ public class ZenModeEventRuleSettings extends ZenModeRuleSettingsBase { @Override protected int getMetricsCategory() { - return MetricsLogger.NOTIFICATION_ZEN_MODE_EVENT_RULE; + return MetricsEvent.NOTIFICATION_ZEN_MODE_EVENT_RULE; } public static CalendarInfo findCalendar(Context context, EventInfo event) { diff --git a/src/com/android/settings/notification/ZenModePrioritySettings.java b/src/com/android/settings/notification/ZenModePrioritySettings.java index f479ba36b77..61bf7fc278f 100644 --- a/src/com/android/settings/notification/ZenModePrioritySettings.java +++ b/src/com/android/settings/notification/ZenModePrioritySettings.java @@ -28,6 +28,7 @@ import android.support.v7.preference.PreferenceScreen; import android.util.Log; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.Indexable; @@ -63,7 +64,7 @@ public class ZenModePrioritySettings extends ZenModeSettingsBase implements Inde public boolean onPreferenceChange(Preference preference, Object newValue) { if (mDisableListeners) return true; final boolean val = (Boolean) newValue; - MetricsLogger.action(mContext, MetricsLogger.ACTION_ZEN_ALLOW_REMINDERS, val); + MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_REMINDERS, val); if (DEBUG) Log.d(TAG, "onPrefChange allowReminders=" + val); savePolicy(getNewPriorityCategories(val, Policy.PRIORITY_CATEGORY_REMINDERS), mPolicy.priorityCallSenders, mPolicy.priorityMessageSenders, @@ -78,7 +79,7 @@ public class ZenModePrioritySettings extends ZenModeSettingsBase implements Inde public boolean onPreferenceChange(Preference preference, Object newValue) { if (mDisableListeners) return true; final boolean val = (Boolean) newValue; - MetricsLogger.action(mContext, MetricsLogger.ACTION_ZEN_ALLOW_EVENTS, val); + MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_EVENTS, val); if (DEBUG) Log.d(TAG, "onPrefChange allowEvents=" + val); savePolicy(getNewPriorityCategories(val, Policy.PRIORITY_CATEGORY_EVENTS), mPolicy.priorityCallSenders, mPolicy.priorityMessageSenders, @@ -97,7 +98,7 @@ public class ZenModePrioritySettings extends ZenModeSettingsBase implements Inde final boolean allowMessages = val != SOURCE_NONE; final int allowMessagesFrom = val == SOURCE_NONE ? mPolicy.priorityMessageSenders : val; - MetricsLogger.action(mContext, MetricsLogger.ACTION_ZEN_ALLOW_MESSAGES, val); + MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_MESSAGES, val); if (DEBUG) Log.d(TAG, "onPrefChange allowMessages=" + allowMessages + " allowMessagesFrom=" + ZenModeConfig.sourceToString(allowMessagesFrom)); savePolicy( @@ -117,7 +118,7 @@ public class ZenModePrioritySettings extends ZenModeSettingsBase implements Inde final int val = Integer.parseInt((String) newValue); final boolean allowCalls = val != SOURCE_NONE; final int allowCallsFrom = val == SOURCE_NONE ? mPolicy.priorityCallSenders : val; - MetricsLogger.action(mContext, MetricsLogger.ACTION_ZEN_ALLOW_CALLS, val); + MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_CALLS, val); if (DEBUG) Log.d(TAG, "onPrefChange allowCalls=" + allowCalls + " allowCallsFrom=" + ZenModeConfig.sourceToString(allowCallsFrom)); savePolicy(getNewPriorityCategories(allowCalls, Policy.PRIORITY_CATEGORY_CALLS), @@ -136,7 +137,7 @@ public class ZenModePrioritySettings extends ZenModeSettingsBase implements Inde public boolean onPreferenceChange(Preference preference, Object newValue) { if (mDisableListeners) return true; final boolean val = (Boolean) newValue; - MetricsLogger.action(mContext, MetricsLogger.ACTION_ZEN_ALLOW_REPEAT_CALLS, val); + MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_REPEAT_CALLS, val); if (DEBUG) Log.d(TAG, "onPrefChange allowRepeatCallers=" + val); int priorityCategories = getNewPriorityCategories(val, NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS); @@ -181,7 +182,7 @@ public class ZenModePrioritySettings extends ZenModeSettingsBase implements Inde @Override protected int getMetricsCategory() { - return MetricsLogger.NOTIFICATION_ZEN_MODE_PRIORITY; + return MetricsEvent.NOTIFICATION_ZEN_MODE_PRIORITY; } private static void addSources(DropDownPreference pref) { diff --git a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java index 19514abe7b3..501a260cf69 100644 --- a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java +++ b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java @@ -40,6 +40,7 @@ import android.widget.Switch; import android.widget.Toast; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.widget.SwitchBar; @@ -162,7 +163,7 @@ public abstract class ZenModeRuleSettingsBase extends ZenModeSettingsBase if (mDisableListeners) return; final boolean enabled = isChecked; if (enabled == mRule.isEnabled()) return; - MetricsLogger.action(mContext, MetricsLogger.ACTION_ZEN_ENABLE_RULE, enabled); + MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_ENABLE_RULE, enabled); if (DEBUG) Log.d(TAG, "onSwitchChanged enabled=" + enabled); mRule.setEnabled(enabled); setZenRule(mRule); @@ -206,7 +207,7 @@ public abstract class ZenModeRuleSettingsBase extends ZenModeSettingsBase public boolean onOptionsItemSelected(MenuItem item) { if (DEBUG) Log.d(TAG, "onOptionsItemSelected " + item.getItemId()); if (item.getItemId() == R.id.delete) { - MetricsLogger.action(mContext, MetricsLogger.ACTION_ZEN_DELETE_RULE); + MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_DELETE_RULE); showDeleteRuleDialog(); return true; } @@ -240,7 +241,7 @@ public abstract class ZenModeRuleSettingsBase extends ZenModeSettingsBase .setPositiveButton(R.string.zen_mode_delete_rule_button, new OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - MetricsLogger.action(mContext, MetricsLogger.ACTION_ZEN_DELETE_RULE_OK); + MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_DELETE_RULE_OK); mDeleting = true; removeZenRule(mRule.getId()); } diff --git a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java index 2147665c690..5f0fa5ed003 100644 --- a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java +++ b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java @@ -36,7 +36,7 @@ import android.text.format.DateFormat; import android.util.Log; import android.widget.TimePicker; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import java.text.SimpleDateFormat; @@ -186,7 +186,7 @@ public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase { @Override protected int getMetricsCategory() { - return MetricsLogger.NOTIFICATION_ZEN_MODE_SCHEDULE_RULE; + return MetricsEvent.NOTIFICATION_ZEN_MODE_SCHEDULE_RULE; } private void showDaysDialog() { diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index 99fd198668f..b875afa44fa 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -25,7 +25,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -55,7 +55,7 @@ public class ZenModeSettings extends ZenModeSettingsBase { @Override protected int getMetricsCategory() { - return MetricsLogger.NOTIFICATION_ZEN_MODE; + return MetricsEvent.NOTIFICATION_ZEN_MODE; } @Override diff --git a/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java b/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java index 46e0cfeb4db..3bc0759a027 100644 --- a/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java +++ b/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java @@ -27,6 +27,7 @@ import android.support.v7.preference.PreferenceScreen; import android.util.Log; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settings.R; @@ -61,7 +62,7 @@ public class ZenModeVisualInterruptionSettings extends ZenModeSettingsBase { public boolean onPreferenceChange(Preference preference, Object newValue) { if (mDisableListeners) return true; final boolean val = (Boolean) newValue; - MetricsLogger.action(mContext, MetricsLogger.ACTION_ZEN_ALLOW_PEEK, val); + MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_PEEK, val); if (DEBUG) Log.d(TAG, "onPrefChange suppressPeek=" + val); savePolicy(getNewSuppressedEffects(val, Policy.SUPPRESSED_EFFECT_PEEK)); return true; @@ -74,7 +75,7 @@ public class ZenModeVisualInterruptionSettings extends ZenModeSettingsBase { public boolean onPreferenceChange(Preference preference, Object newValue) { if (mDisableListeners) return true; final boolean val = (Boolean) newValue; - MetricsLogger.action(mContext, MetricsLogger.ACTION_ZEN_ALLOW_LIGHTS, val); + MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_LIGHTS, val); if (DEBUG) Log.d(TAG, "onPrefChange suppressLights=" + val); savePolicy(getNewSuppressedEffects(val, Policy.SUPPRESSED_EFFECT_LIGHTS)); return true; @@ -87,7 +88,7 @@ public class ZenModeVisualInterruptionSettings extends ZenModeSettingsBase { public boolean onPreferenceChange(Preference preference, Object newValue) { if (mDisableListeners) return true; final boolean val = (Boolean) newValue; - MetricsLogger.action(mContext, MetricsLogger.ACTION_ZEN_ALLOW_SCREEN_ON, val); + MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_SCREEN_ON, val); if (DEBUG) Log.d(TAG, "onPrefChange suppressScreenOn=" + val); savePolicy(getNewSuppressedEffects(val, Policy.SUPPRESSED_EFFECT_SCREEN_ON)); return true; @@ -97,7 +98,7 @@ public class ZenModeVisualInterruptionSettings extends ZenModeSettingsBase { @Override protected int getMetricsCategory() { - return MetricsLogger.NOTIFICATION_ZEN_MODE_VISUAL_INTERRUPTIONS; + return MetricsEvent.NOTIFICATION_ZEN_MODE_VISUAL_INTERRUPTIONS; } @Override diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java index 11b4ba28008..10c96f08138 100644 --- a/src/com/android/settings/print/PrintJobSettingsFragment.java +++ b/src/com/android/settings/print/PrintJobSettingsFragment.java @@ -31,7 +31,7 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -67,7 +67,7 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.PRINT_JOB_SETTINGS; + return MetricsEvent.PRINT_JOB_SETTINGS; } @Override diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java index 2ac84f46fba..2adfb174fc6 100644 --- a/src/com/android/settings/print/PrintServiceSettingsFragment.java +++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java @@ -56,7 +56,7 @@ import android.widget.SearchView; import android.widget.Switch; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; @@ -135,7 +135,7 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.PRINT_SERVICE_SETTINGS; + return MetricsEvent.PRINT_SERVICE_SETTINGS; } @Override @@ -711,4 +711,3 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment } } } - diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java index d5cd9c53e58..537f5dee720 100644 --- a/src/com/android/settings/print/PrintSettingsFragment.java +++ b/src/com/android/settings/print/PrintSettingsFragment.java @@ -59,7 +59,7 @@ import android.widget.Spinner; import android.widget.TextView; import com.android.internal.content.PackageMonitor; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.DialogCreatable; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -128,7 +128,7 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.PRINT_SETTINGS; + return MetricsEvent.PRINT_SETTINGS; } @Override diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index 9b19c41e139..adc9594de45 100644 --- a/src/com/android/settings/sim/SimSettings.java +++ b/src/com/android/settings/sim/SimSettings.java @@ -35,7 +35,7 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.telephony.TelephonyProperties; import com.android.settings.R; import com.android.settings.RestrictedSettingsFragment; @@ -77,7 +77,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable @Override protected int getMetricsCategory() { - return MetricsLogger.SIM; + return MetricsEvent.SIM; } @Override diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java index 82c457712d7..2d30ecf6f49 100644 --- a/src/com/android/settings/tts/TextToSpeechSettings.java +++ b/src/com/android/settings/tts/TextToSpeechSettings.java @@ -33,7 +33,7 @@ import android.text.TextUtils; import android.util.Log; import android.widget.Checkable; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; @@ -145,7 +145,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements @Override protected int getMetricsCategory() { - return MetricsLogger.TTS_TEXT_TO_SPEECH; + return MetricsEvent.TTS_TEXT_TO_SPEECH; } @Override diff --git a/src/com/android/settings/tts/TtsEngineSettingsFragment.java b/src/com/android/settings/tts/TtsEngineSettingsFragment.java index cdb952e1292..b12df9f8878 100644 --- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java +++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java @@ -33,7 +33,7 @@ import android.text.TextUtils; import android.util.Log; import android.util.Pair; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -101,7 +101,7 @@ public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implem @Override protected int getMetricsCategory() { - return MetricsLogger.TTS_ENGINE_SETTINGS; + return MetricsEvent.TTS_ENGINE_SETTINGS; } @Override diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java index 8e105c8a60b..63d688a99a3 100644 --- a/src/com/android/settings/users/AppRestrictionsFragment.java +++ b/src/com/android/settings/users/AppRestrictionsFragment.java @@ -52,7 +52,7 @@ import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.Switch; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; @@ -243,7 +243,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen @Override protected int getMetricsCategory() { - return MetricsLogger.USERS_APP_RESTRICTIONS; + return MetricsEvent.USERS_APP_RESTRICTIONS; } @Override diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java index 07d03ee67c1..a7af930c57a 100644 --- a/src/com/android/settings/users/UserDetailsSettings.java +++ b/src/com/android/settings/users/UserDetailsSettings.java @@ -26,7 +26,7 @@ import android.os.UserManager; import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.Preference; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.RestrictedPreference; @@ -68,7 +68,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.USER_DETAILS; + return MetricsEvent.USER_DETAILS; } @Override diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index 8229464c271..bf03ff9b5d4 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -53,7 +53,7 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.SimpleAdapter; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.ChooseLockGeneric; import com.android.settings.DimmableIconPreference; @@ -185,7 +185,7 @@ public class UserSettings extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.USER; + return MetricsEvent.USER; } @Override diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java index 85d1928b49f..cd24be882bf 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -51,7 +51,7 @@ import android.view.MenuItem; import android.view.View; import android.widget.TextView; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.net.LegacyVpnInfo; import com.android.internal.net.VpnConfig; import com.android.internal.net.VpnProfile; @@ -103,7 +103,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements @Override protected int getMetricsCategory() { - return MetricsLogger.VPN; + return MetricsEvent.VPN; } @Override diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java index 4bdadbf8568..0d6287128df 100755 --- a/src/com/android/settings/wfd/WifiDisplaySettings.java +++ b/src/com/android/settings/wfd/WifiDisplaySettings.java @@ -58,7 +58,7 @@ import android.widget.ImageView; import android.widget.TextView; import com.android.internal.app.MediaRouteDialogPresenter; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -116,7 +116,7 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.WFD_WIFI_DISPLAY; + return MetricsEvent.WFD_WIFI_DISPLAY; } @Override diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java index 8dfb024813d..fd81fef0fe7 100644 --- a/src/com/android/settings/wifi/AdvancedWifiSettings.java +++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java @@ -25,7 +25,7 @@ import android.os.Bundle; import android.security.Credentials; import android.support.v7.preference.Preference; import android.support.v7.preference.Preference.OnPreferenceClickListener; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -39,7 +39,7 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment { @Override protected int getMetricsCategory() { - return MetricsLogger.WIFI_ADVANCED; + return MetricsEvent.WIFI_ADVANCED; } @Override diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java index c5aca2089e6..c85ae2effb1 100644 --- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java +++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java @@ -25,7 +25,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import android.util.Log; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -60,7 +60,7 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.WIFI_SAVED_ACCESS_POINTS; + return MetricsEvent.WIFI_SAVED_ACCESS_POINTS; } @Override diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java index fe52cf2418c..2ff404d0f36 100644 --- a/src/com/android/settings/wifi/WifiEnabler.java +++ b/src/com/android/settings/wifi/WifiEnabler.java @@ -31,6 +31,7 @@ import android.widget.Switch; import android.widget.Toast; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.Index; import com.android.settings.widget.SwitchBar; @@ -211,7 +212,7 @@ public class WifiEnabler implements SwitchBar.OnSwitchChangeListener { mWifiManager.setWifiApEnabled(null, false); } MetricsLogger.action(mContext, - isChecked ? MetricsLogger.ACTION_WIFI_ON : MetricsLogger.ACTION_WIFI_OFF); + isChecked ? MetricsEvent.ACTION_WIFI_ON : MetricsEvent.ACTION_WIFI_OFF); if (!mWifiManager.setWifiEnabled(isChecked)) { // Error mSwitchBar.setEnabled(true); diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 2336899ea31..e391fc8e955 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -65,6 +65,7 @@ import android.widget.TextView.BufferType; import android.widget.Toast; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.LinkifyUtils; import com.android.settings.R; import com.android.settings.RestrictedSettingsFragment; @@ -365,7 +366,7 @@ public class WifiSettings extends RestrictedSettingsFragment @Override protected int getMetricsCategory() { - return MetricsLogger.WIFI; + return MetricsEvent.WIFI; } @Override @@ -416,7 +417,7 @@ public class WifiSettings extends RestrictedSettingsFragment showDialog(WPS_PIN_DIALOG_ID); return true; case MENU_ID_SCAN: - MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_FORCE_SCAN); + MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_FORCE_SCAN); mWifiTracker.forceScan(); return true; case MENU_ID_ADVANCED: @@ -855,7 +856,7 @@ public class WifiSettings extends RestrictedSettingsFragment } /* package */ void forget() { - MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_FORGET); + MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_FORGET); if (!mSelectedAccessPoint.isSaved()) { if (mSelectedAccessPoint.getNetworkInfo() != null && mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) { @@ -878,12 +879,12 @@ public class WifiSettings extends RestrictedSettingsFragment } protected void connect(final WifiConfiguration config) { - MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_CONNECT); + MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_CONNECT); mWifiManager.connect(config, mConnectListener); } protected void connect(final int networkId) { - MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_CONNECT); + MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_CONNECT); mWifiManager.connect(networkId, mConnectListener); } @@ -891,7 +892,7 @@ public class WifiSettings extends RestrictedSettingsFragment * Called when "add network" button is pressed. */ /* package */ void onAddNetworkPressed() { - MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_ADD_NETWORK); + MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_ADD_NETWORK); // No exact access point is selected. mSelectedAccessPoint = null; showDialog(null, WifiConfigUiBase.MODE_CONNECT); diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java index 1ba17f1f2b8..25f99f11989 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java @@ -51,7 +51,7 @@ import android.view.MenuItem; import android.widget.EditText; import android.widget.Toast; -import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -492,7 +492,7 @@ public class WifiP2pSettings extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return MetricsLogger.WIFI_P2P; + return MetricsEvent.WIFI_P2P; } @Override