From 31b210017b59bcf90590c3832cf533d7ceb1dce6 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 16 Jan 2019 13:49:47 -0800 Subject: [PATCH] Migrate all MetricsProto enums to SettingsEnums Bug: 122855168 Test: rebuild Change-Id: I962d9a71179f86b7cae9dc5e9a00e0aa1557dc76 --- .../android/settings/AirplaneModeEnabler.java | 4 +- src/com/android/settings/BandMode.java | 1 - .../android/settings/BugreportPreference.java | 6 +- .../android/settings/CryptKeeperConfirm.java | 4 +- .../settings/CustomListPreference.java | 4 +- .../android/settings/DateTimeSettings.java | 8 +-- src/com/android/settings/DisplaySettings.java | 4 +- .../settings/EncryptionInterstitial.java | 6 +- src/com/android/settings/IccLockSettings.java | 4 +- src/com/android/settings/LegalSettings.java | 4 +- .../settings/ManualDisplayActivity.java | 1 - src/com/android/settings/MasterClear.java | 4 +- .../android/settings/MasterClearConfirm.java | 4 +- src/com/android/settings/ProxySelector.java | 6 +- src/com/android/settings/ResetNetwork.java | 5 +- .../android/settings/ResetNetworkConfirm.java | 5 +- .../settings/RestrictedSettingsFragment.java | 1 - .../settings/SettingsLicenseActivity.java | 1 - .../android/settings/SetupWizardUtils.java | 2 - src/com/android/settings/TestingSettings.java | 5 +- src/com/android/settings/TetherSettings.java | 4 +- .../settings/TrustedCredentialsSettings.java | 4 +- .../settings/UserCredentialsSettings.java | 6 +- ...ilityContentTimeoutPreferenceFragment.java | 7 +-- ...ilityControlTimeoutPreferenceFragment.java | 7 +-- ...ibilityHearingAidPreferenceController.java | 4 +- .../AccessibilityServiceWarning.java | 3 - .../accessibility/AccessibilitySettings.java | 4 +- .../AccessibilitySettingsForSetupWizard.java | 4 +- ...cessibilityShortcutPreferenceFragment.java | 4 +- .../AccessibilityTimeoutController.java | 2 - .../CaptionPropertiesFragment.java | 4 +- .../HearingAidDialogFragment.java | 6 +- .../MagnificationPreferenceFragment.java | 4 +- ...tificationVibrationPreferenceFragment.java | 4 +- .../RingVibrationPreferenceFragment.java | 4 +- .../ShortcutServicePickerFragment.java | 15 ++--- ...ccessibilityServicePreferenceFragment.java | 8 +-- .../ToggleAutoclickPreferenceFragment.java | 4 +- .../ToggleDaltonizerPreferenceFragment.java | 4 +- ...ScreenMagnificationPreferenceFragment.java | 4 +- ...ationPreferenceFragmentForSetupWizard.java | 7 +-- ...eaderPreferenceFragmentForSetupWizard.java | 7 +-- ...SpeakPreferenceFragmentForSetupWizard.java | 7 +-- .../TouchVibrationPreferenceFragment.java | 4 +- .../accessibility/VibrationSettings.java | 4 +- .../accounts/AccountDashboardFragment.java | 4 +- .../AccountDetailDashboardFragment.java | 4 +- .../accounts/AccountFeatureProvider.java | 1 - .../AccountSyncPreferenceController.java | 4 +- .../accounts/AccountSyncSettings.java | 6 +- .../accounts/ChooseAccountFragment.java | 4 +- ...ssProfileCalendarPreferenceController.java | 6 +- .../accounts/ManagedProfileSettings.java | 4 +- .../RemoveAccountPreferenceController.java | 6 +- .../settings/accounts/RemoveUserFragment.java | 4 +- .../AppAndNotificationDashboardFragment.java | 4 +- .../settings/applications/AppInfoBase.java | 4 +- .../applications/AppLaunchSettings.java | 5 +- .../applications/AppStorageSettings.java | 8 +-- .../applications/ConfirmConvertToFbe.java | 4 +- .../settings/applications/ConvertToFbe.java | 4 +- .../applications/DefaultAppSettings.java | 4 +- .../applications/ProcessStatsDetail.java | 4 +- .../applications/ProcessStatsSummary.java | 4 +- .../settings/applications/ProcessStatsUi.java | 4 +- .../RecentAppsPreferenceController.java | 6 +- .../applications/RunningServiceDetails.java | 6 +- .../applications/RunningServices.java | 4 +- .../applications/UsageAccessDetails.java | 8 +-- .../AppButtonsPreferenceController.java | 16 ++--- .../appinfo/AppInfoDashboardFragment.java | 9 ++- .../AppSettingPreferenceController.java | 4 +- .../appinfo/ButtonActionDialogFragment.java | 4 +- ...ltAppShortcutPreferenceControllerBase.java | 4 +- .../appinfo/DrawOverlayDetails.java | 8 +-- .../appinfo/ExternalSourcesDetails.java | 4 +- .../InstantAppButtonDialogFragment.java | 6 +- .../appinfo/WriteSettingsDetails.java | 8 +-- .../appops/BackgroundCheckSummary.java | 4 +- .../assist/DefaultAssistPicker.java | 4 +- .../assist/DefaultVoiceInputPicker.java | 4 +- .../applications/assist/ManageAssist.java | 4 +- .../defaultapps/AutofillPicker.java | 4 +- .../defaultapps/DefaultAppPickerFragment.java | 5 +- .../defaultapps/DefaultAutofillPicker.java | 4 +- .../defaultapps/DefaultBrowserPicker.java | 4 +- .../defaultapps/DefaultEmergencyPicker.java | 4 +- .../defaultapps/DefaultHomePicker.java | 4 +- .../defaultapps/DefaultPhonePicker.java | 4 +- .../defaultapps/DefaultSmsPicker.java | 4 +- .../ManageApplications.java | 63 ++++++++----------- .../managedomainurls/ManageDomainUrls.java | 4 +- .../specialaccess/SpecialAccessSettings.java | 4 +- .../deviceadmin/DeviceAdminAdd.java | 5 +- .../deviceadmin/DeviceAdminSettings.java | 4 +- .../FinancialAppsController.java | 12 ++-- .../PictureInPictureDetails.java | 8 +-- .../PictureInPictureSettings.java | 4 +- .../premiumsms/PremiumSmsAccess.java | 10 +-- .../vrlistener/VrListenerSettings.java | 8 +-- .../backup/BackupSettingsFragment.java | 4 +- .../settings/backup/PrivacySettings.java | 4 +- .../backup/ToggleBackupSettingFragment.java | 4 +- .../biometrics/face/FaceEnrollEnrolling.java | 10 +-- .../biometrics/face/FaceEnrollFinish.java | 4 +- .../face/FaceEnrollIntroduction.java | 4 +- .../face/FaceEnrollPreviewFragment.java | 4 +- .../biometrics/face/FaceEnrollSidecar.java | 5 +- .../biometrics/face/FaceSettings.java | 4 +- ...SettingsAttentionPreferenceController.java | 6 +- .../FingerprintAuthenticateSidecar.java | 4 +- .../FingerprintEnrollEnrolling.java | 8 +-- .../FingerprintEnrollFindSensor.java | 5 +- .../fingerprint/FingerprintEnrollFinish.java | 4 +- .../FingerprintEnrollIntroduction.java | 4 +- .../fingerprint/FingerprintEnrollSidecar.java | 4 +- .../fingerprint/FingerprintRemoveSidecar.java | 4 +- .../fingerprint/FingerprintSettings.java | 16 +++-- .../SetupFingerprintEnrollEnrolling.java | 4 +- .../SetupFingerprintEnrollFindSensor.java | 7 +-- .../SetupFingerprintEnrollFinish.java | 5 +- .../SetupFingerprintEnrollIntroduction.java | 4 +- .../BluetoothDetailsHeaderController.java | 1 - .../BluetoothDeviceDetailsFragment.java | 8 +-- .../bluetooth/BluetoothDevicePreference.java | 10 +-- ...toothDeviceRenamePreferenceController.java | 4 +- .../bluetooth/BluetoothDeviceUpdater.java | 1 - .../BluetoothFilesPreferenceController.java | 4 +- .../bluetooth/BluetoothPairingDetail.java | 4 +- .../BluetoothPairingDialogFragment.java | 4 +- .../BluetoothPermissionActivity.java | 3 - .../bluetooth/BluetoothSliceBuilder.java | 4 +- .../BluetoothSwitchPreferenceController.java | 7 +-- .../bluetooth/DevicePickerFragment.java | 4 +- .../bluetooth/ForgetDeviceDialogFragment.java | 4 +- .../LocalDeviceNameDialogFragment.java | 4 +- .../RemoteDeviceNameDialogFragment.java | 4 +- src/com/android/settings/bluetooth/Utils.java | 9 +-- ...ancedConnectedDeviceDashboardFragment.java | 4 +- .../BluetoothDashboardFragment.java | 4 +- .../ConnectedDeviceDashboardFragment.java | 4 +- ...ouslyConnectedDeviceDashboardFragment.java | 4 +- ...lConnectedDevicesPreferenceController.java | 2 +- .../usb/UsbConnectionBroadcastReceiver.java | 1 - .../usb/UsbDefaultFragment.java | 5 +- .../usb/UsbDetailsDataRoleController.java | 1 - .../usb/UsbDetailsFragment.java | 4 +- .../usb/UsbDetailsFunctionsController.java | 1 - .../usb/UsbDetailsPowerRoleController.java | 2 - .../core/instrumentation/StatsLogWriter.java | 2 +- .../DashboardFeatureProviderImpl.java | 6 +- .../settings/dashboard/DashboardFragment.java | 3 +- .../settings/datausage/AppDataUsage.java | 4 +- .../datausage/BillingCyclePreference.java | 4 +- .../datausage/BillingCycleSettings.java | 10 +-- .../datausage/CellDataPreference.java | 4 +- .../settings/datausage/DataSaverBackend.java | 8 +-- .../settings/datausage/DataSaverSummary.java | 4 +- .../settings/datausage/DataUsageList.java | 9 +-- .../datausage/DataUsagePreference.java | 4 +- .../settings/datausage/DataUsageSummary.java | 4 +- .../datausage/DataUsageSummaryPreference.java | 4 +- .../datausage/UnrestrictedDataAccess.java | 4 +- ...trictedDataAccessPreferenceController.java | 6 +- .../datetime/timezone/FixedOffsetPicker.java | 4 +- .../datetime/timezone/RegionSearchPicker.java | 4 +- .../datetime/timezone/RegionZonePicker.java | 4 +- .../datetime/timezone/TimeZoneSettings.java | 4 +- .../AutomaticStorageManagerSettings.java | 4 +- ...aticStorageManagerSwitchBarController.java | 4 +- ...undActivityStartsPreferenceController.java | 6 +- .../BluetoothA2dpHwOffloadRebootDialog.java | 4 +- .../ClearAdbKeysPreferenceController.java | 1 - .../ClearAdbKeysWarningDialog.java | 4 +- .../DevelopmentSettingsDashboardFragment.java | 4 +- .../DisableDevSettingsDialogFragment.java | 8 +-- .../DisableLogPersistWarningDialog.java | 4 +- .../development/EnableAdbWarningDialog.java | 4 +- ...EnableDevelopmentSettingWarningDialog.java | 4 +- .../EnableOemUnlockSettingWarningDialog.java | 4 +- .../ForceMSAAPreferenceController.java | 1 - .../MockLocationAppPreferenceController.java | 3 +- .../development/OemLockInfoDialog.java | 4 +- .../OemUnlockPreferenceController.java | 3 +- .../OverlayCategoryPreferenceController.java | 10 +-- .../SelectDebugAppPreferenceController.java | 3 +- .../ShowLayoutBoundsPreferenceController.java | 1 - ...AccessRestrictionPreferenceController.java | 6 +- .../WaitForDebuggerPreferenceController.java | 3 +- .../featureflags/FeatureFlagPersistent.java | 2 - .../featureflags/FeatureFlagsDashboard.java | 4 +- .../development/gup/GupDashboard.java | 6 +- .../qstile/DevelopmentTileConfigFragment.java | 4 +- .../development/qstile/DevelopmentTiles.java | 1 - .../BrandedAccountPreferenceController.java | 4 +- .../BuildNumberPreferenceController.java | 7 ++- .../DeviceModelPreferenceController.java | 1 - .../HardwareInfoDialogFragment.java | 4 +- .../deviceinfo/PrivateVolumeForget.java | 6 +- .../deviceinfo/PrivateVolumeFormat.java | 4 +- .../deviceinfo/PrivateVolumeSettings.java | 14 ++--- .../deviceinfo/PrivateVolumeUnmount.java | 4 +- .../deviceinfo/PublicVolumeSettings.java | 4 +- .../deviceinfo/StorageDashboardFragment.java | 4 +- .../deviceinfo/StorageProfileFragment.java | 4 +- .../settings/deviceinfo/StorageSettings.java | 8 +-- .../StorageWizardFormatConfirm.java | 4 +- .../deviceinfo/StorageWizardFormatSlow.java | 8 +-- .../deviceinfo/StorageWizardInit.java | 6 +- .../StorageWizardMigrateConfirm.java | 6 +- .../aboutphone/DeviceNameWarningDialog.java | 4 +- .../aboutphone/MyDeviceInfoFragment.java | 4 +- .../FirmwareVersionDialogFragment.java | 4 +- .../imei/ImeiInfoDialogFragment.java | 4 +- .../simstatus/SimStatusDialogController.java | 4 +- .../simstatus/SimStatusDialogFragment.java | 4 +- ...eManagementSwitchPreferenceController.java | 4 +- .../StorageItemPreferenceController.java | 4 +- .../StorageSummaryDonutPreference.java | 4 +- .../storage/UserProfileController.java | 4 +- ...playNotificationsPreferenceController.java | 5 +- .../display/AutoBrightnessSettings.java | 4 +- .../AutoRotatePreferenceController.java | 4 +- .../display/ColorModePreferenceFragment.java | 4 +- ...splayWhiteBalancePreferenceController.java | 1 + ...tSizePreferenceFragmentForSetupWizard.java | 6 +- ...playCustomEndTimePreferenceController.java | 3 +- ...ayCustomStartTimePreferenceController.java | 3 +- ...ightDisplayFooterPreferenceController.java | 3 +- .../NightDisplayPreferenceController.java | 2 +- .../display/NightDisplaySettings.java | 8 +-- .../settings/display/PreviewPagerAdapter.java | 4 -- ...nZoomPreferenceFragmentForSetupWizard.java | 6 +- .../settings/display/ScreenZoomSettings.java | 4 +- .../display/ThemePreferenceController.java | 4 +- .../ToggleFontSizePreferenceFragment.java | 4 +- .../display/VrDisplayPreferencePicker.java | 4 +- .../settings/dream/CurrentDreamPicker.java | 4 +- .../android/settings/dream/DreamSettings.java | 4 +- .../settings/dream/WhenToDreamPicker.java | 4 +- .../enterprise/ApplicationListFragment.java | 6 +- .../enterprise/EnterprisePrivacySettings.java | 4 +- .../EnterpriseSetDefaultAppsListFragment.java | 4 +- .../fuelgauge/AdvancedPowerUsageDetail.java | 4 +- .../fuelgauge/BatterySaverController.java | 2 +- .../settings/fuelgauge/HighPowerDetail.java | 8 +-- .../settings/fuelgauge/InactiveApps.java | 4 +- .../fuelgauge/PowerUsageAdvanced.java | 6 +- .../settings/fuelgauge/PowerUsageSummary.java | 4 +- .../fuelgauge/RestrictedAppDetails.java | 4 +- .../fuelgauge/SmartBatterySettings.java | 4 +- ...terySaverSchedulePreferenceController.java | 2 + ...BatterySaverScheduleSeekBarController.java | 2 + .../BatterySaverScheduleSettings.java | 6 +- .../batterysaver/BatterySaverSettings.java | 7 +-- .../AnomalyDetectionJobService.java | 5 +- .../batterytip/BatteryDatabaseManager.java | 12 ++-- .../batterytip/BatteryTipDialogFragment.java | 4 +- .../actions/BatterySaverAction.java | 4 +- .../actions/OpenBatterySaverAction.java | 4 +- .../OpenRestrictAppFragmentAction.java | 5 +- .../batterytip/actions/RestrictAppAction.java | 5 +- .../actions/SmartBatteryAction.java | 5 +- .../actions/UnrestrictAppAction.java | 3 +- .../fuelgauge/batterytip/tips/BatteryTip.java | 1 - .../batterytip/tips/EarlyWarningTip.java | 4 +- .../batterytip/tips/HighUsageTip.java | 6 +- .../batterytip/tips/LowBatteryTip.java | 4 +- .../batterytip/tips/RestrictAppTip.java | 5 +- .../batterytip/tips/SmartBatteryTip.java | 4 +- .../fuelgauge/batterytip/tips/SummaryTip.java | 4 +- .../gestures/AssistGestureSettings.java | 4 +- .../gestures/DoubleTapPowerSettings.java | 4 +- .../gestures/DoubleTapScreenSettings.java | 4 +- .../gestures/DoubleTwistGestureSettings.java | 4 +- .../settings/gestures/GestureSettings.java | 4 +- .../GesturesSettingPreferenceController.java | 4 +- .../gestures/PickupGestureSettings.java | 4 +- ...entRingingGesturePreferenceController.java | 8 +-- .../PreventRingingGestureSettings.java | 4 +- .../gestures/SwipeToNotificationSettings.java | 4 +- .../gestures/SwipeUpGestureSettings.java | 4 +- .../WakeLockScreenGestureSettings.java | 4 +- .../settings/homepage/TopLevelSettings.java | 7 +-- .../AirplaneModeConditionController.java | 4 +- .../BackgroundDataConditionController.java | 4 +- .../BatterySaverConditionController.java | 6 +- .../CellularDataConditionController.java | 4 +- .../ConditionContextualCardRenderer.java | 8 +-- ...ConditionFooterContextualCardRenderer.java | 3 +- ...ConditionHeaderContextualCardRenderer.java | 3 +- .../DndConditionCardController.java | 6 +- .../HotspotConditionController.java | 6 +- .../NightDisplayConditionController.java | 6 +- .../RingerMutedConditionController.java | 4 +- .../RingerVibrateConditionController.java | 4 +- .../WorkModeConditionController.java | 4 +- .../deviceinfo/BatteryInfoSlice.java | 4 +- .../deviceinfo/DataUsageSlice.java | 4 +- .../deviceinfo/DeviceInfoSlice.java | 4 +- .../deviceinfo/StorageSlice.java | 4 +- .../slices/BatteryFixSlice.java | 4 +- .../slices/BluetoothDevicesSlice.java | 3 +- .../slices/LowStorageSlice.java | 4 +- .../AvailableVirtualKeyboardFragment.java | 4 +- .../InputMethodAndSubtypeEnabler.java | 4 +- .../KeyboardLayoutDialogFragment.java | 4 +- .../KeyboardLayoutPickerFragment.java | 4 +- .../inputmethod/PhysicalKeyboardFragment.java | 4 +- .../inputmethod/SpellCheckersSettings.java | 4 +- .../UserDictionaryAddWordFragment.java | 4 +- .../inputmethod/UserDictionaryList.java | 4 +- .../inputmethod/UserDictionarySettings.java | 4 +- .../inputmethod/VirtualKeyboardFragment.java | 4 +- .../language/LanguageAndInputSettings.java | 4 +- .../PhoneLanguagePreferenceController.java | 4 +- .../localepicker/LocaleListEditor.java | 4 +- .../settings/location/LocationSettings.java | 4 +- .../settings/location/LocationSlice.java | 4 +- .../settings/location/ScanningSettings.java | 4 +- .../AirplaneModePreferenceController.java | 1 - .../android/settings/network/ApnEditor.java | 6 +- .../android/settings/network/ApnSettings.java | 6 +- .../network/MobileNetworkListController.java | 12 ++-- .../MobileNetworkSummaryController.java | 12 ++-- .../network/MultiNetworkHeaderController.java | 12 ++-- .../network/NetworkDashboardFragment.java | 9 ++- .../settings/network/NetworkScorerPicker.java | 4 +- .../PrivateDnsModeDialogPreference.java | 7 +-- .../PrivateDnsPreferenceController.java | 4 +- .../settings/network/SubscriptionUtil.java | 4 +- .../SubscriptionsPreferenceController.java | 12 ++-- .../CarrierPreferenceController.java | 2 +- .../DataServiceSetupPreferenceController.java | 1 - ...nabledNetworkModePreferenceController.java | 1 - .../telephony/EuiccPreferenceController.java | 3 - .../network/telephony/MobileNetworkUtils.java | 2 - .../telephony/NetworkSelectSettings.java | 3 +- .../telephony/RoamingDialogFragment.java | 3 - .../CdmaSubscriptionPreferenceController.java | 2 - .../gsm/AutoSelectPreferenceController.java | 1 - ...NetworkSelectPagePreferenceController.java | 1 - src/com/android/settings/nfc/AndroidBeam.java | 4 +- .../android/settings/nfc/PaymentSettings.java | 4 +- ...ModeAutomaticRulePreferenceController.java | 4 +- .../notification/AppNotificationSettings.java | 4 +- .../ChannelGroupNotificationSettings.java | 4 +- .../ChannelNotificationSettings.java | 4 +- .../ChannelSummaryPreference.java | 4 +- .../ConfigureNotificationSettings.java | 4 +- ...otificationAccessConfirmationActivity.java | 9 +-- .../NotificationAccessSettings.java | 10 +-- .../notification/NotificationBackend.java | 5 +- .../NotificationSettingsBase.java | 1 - .../notification/NotificationStation.java | 4 +- ...centNotifyingAppsPreferenceController.java | 5 +- .../notification/RedactionInterstitial.java | 4 +- .../SettingsEnableZenModeDialog.java | 4 +- .../SettingsZenDurationDialog.java | 4 +- .../settings/notification/SoundSettings.java | 9 ++- .../WorkSoundPreferenceController.java | 4 +- .../notification/ZenAccessSettings.java | 12 ++-- ...tomaticRuleHeaderPreferenceController.java | 3 - .../ZenCustomRuleBlockedEffectsSettings.java | 18 +++--- .../ZenCustomRuleCallsSettings.java | 4 +- .../ZenCustomRuleConfigSettings.java | 20 +++--- .../ZenCustomRuleMessagesSettings.java | 4 +- .../ZenCustomRuleNotificationsSettings.java | 4 +- .../notification/ZenCustomRuleSettings.java | 4 +- .../notification/ZenDeleteRuleDialog.java | 10 +-- .../ZenModeAlarmsPreferenceController.java | 4 +- ...eAllBypassingAppsPreferenceController.java | 17 +++-- .../ZenModeAutomationSettings.java | 4 +- .../ZenModeBlockedEffectsSettings.java | 18 +++--- .../ZenModeButtonPreferenceController.java | 10 +-- .../ZenModeBypassingAppsSettings.java | 8 +-- .../ZenModeCallsPreferenceController.java | 4 +- .../notification/ZenModeCallsSettings.java | 4 +- .../ZenModeEventRuleSettings.java | 4 +- .../ZenModeEventsPreferenceController.java | 4 +- .../notification/ZenModeMessagesSettings.java | 4 +- .../ZenModeRemindersPreferenceController.java | 4 +- ...ModeRepeatCallersPreferenceController.java | 4 +- .../ZenModeRestrictNotificationsSettings.java | 4 +- .../ZenModeScheduleRuleSettings.java | 6 +- .../notification/ZenModeSettings.java | 5 +- ...odeSettingsFooterPreferenceController.java | 6 +- .../notification/ZenModeSliceBuilder.java | 4 +- .../ZenModeSoundVibrationSettings.java | 4 +- .../ZenModeSystemPreferenceController.java | 4 +- ...ModeVisEffectsAllPreferenceController.java | 4 +- ...eVisEffectsCustomPreferenceController.java | 6 +- ...odeVisEffectsNonePreferenceController.java | 4 +- .../notification/ZenOnboardingActivity.java | 10 +-- .../ZenRuleButtonsPreferenceController.java | 6 +- .../ZenRuleCallsPreferenceController.java | 3 +- ...nRuleCustomPolicyPreferenceController.java | 5 +- ...nRuleCustomSwitchPreferenceController.java | 1 + ...RuleDefaultPolicyPreferenceController.java | 7 ++- .../ZenRuleMessagesPreferenceController.java | 3 +- .../notification/ZenRuleNameDialog.java | 4 +- .../notification/ZenRulePreference.java | 4 -- ...RuleRepeatCallersPreferenceController.java | 9 +-- .../notification/ZenRuleSelectionDialog.java | 12 ++-- .../ZenRuleVisEffectPreferenceController.java | 2 +- ...RuleVisEffectsAllPreferenceController.java | 8 +-- ...eVisEffectsCustomPreferenceController.java | 9 +-- ...uleVisEffectsNonePreferenceController.java | 10 +-- .../android/settings/panel/PanelFragment.java | 11 ++-- .../settings/panel/SettingsPanelActivity.java | 1 - .../android/settings/panel/VolumePanel.java | 1 + .../settings/password/BiometricFragment.java | 6 +- .../settings/password/ChooseLockGeneric.java | 6 +- .../settings/password/ChooseLockPassword.java | 4 +- .../settings/password/ChooseLockPattern.java | 4 +- .../password/ChooseLockSettingsHelper.java | 1 - .../ChooseLockTypeDialogFragment.java | 4 +- .../password/ConfirmLockPassword.java | 4 +- .../settings/password/ConfirmLockPattern.java | 4 +- .../settings/password/SetupSkipDialog.java | 4 +- .../print/PrintJobSettingsFragment.java | 4 +- .../print/PrintServiceSettingsFragment.java | 4 +- .../settings/print/PrintSettingsFragment.java | 4 +- .../privacy/PrivacyDashboardFragment.java | 4 +- .../search/BaseSearchIndexProvider.java | 3 +- .../search/SearchFeatureProvider.java | 4 +- .../actionbar/SearchMenuController.java | 4 +- .../security/ConfigureKeyGuardDialog.java | 4 +- .../security/CryptKeeperSettings.java | 4 +- .../security/EncryptionAndCredential.java | 7 +-- .../security/LockscreenDashboardFragment.java | 5 +- .../security/ScreenPinningSettings.java | 4 +- .../settings/security/SecuritySettings.java | 7 +-- .../UnificationConfirmationDialog.java | 4 +- .../screenlock/ScreenLockSettings.java | 4 +- .../trustagent/TrustAgentSettings.java | 4 +- ...gentsExtendUnlockPreferenceController.java | 1 - ...stLostLocksScreenPreferenceController.java | 1 - .../settings/shortcut/CreateShortcut.java | 7 +-- .../CreateShortcutPreferenceController.java | 4 +- src/com/android/settings/sim/SimSettings.java | 4 +- .../slices/SliceBroadcastReceiver.java | 3 +- .../settings/slices/SliceBuilderUtils.java | 3 +- .../settings/slices/SliceDataConverter.java | 2 +- .../system/ResetDashboardFragment.java | 4 +- .../system/SystemDashboardFragment.java | 4 +- .../settings/tts/TextToSpeechSettings.java | 4 +- .../tts/TtsEnginePreferenceFragment.java | 4 +- .../users/AppRestrictionsFragment.java | 4 +- .../AutoSyncDataPreferenceController.java | 4 +- .../settings/users/OwnerInfoSettings.java | 4 +- .../users/RestrictedProfileSettings.java | 6 +- .../settings/users/UserDetailsSettings.java | 11 ++-- .../android/settings/users/UserSettings.java | 22 +++---- .../utils/ManagedServiceSettings.java | 14 ++--- .../settings/vpn2/AppDialogFragment.java | 4 +- .../settings/vpn2/AppManagementFragment.java | 6 +- .../settings/vpn2/ConfigDialogFragment.java | 4 +- .../vpn2/ConfirmLockdownFragment.java | 4 +- .../android/settings/vpn2/VpnSettings.java | 4 +- .../WallpaperSuggestionActivity.java | 4 +- .../wallpaper/WallpaperTypeSettings.java | 4 +- .../settings/webview/WebViewAppPicker.java | 4 +- .../settings/wfd/WifiDisplaySettings.java | 4 +- .../widget/EntityHeaderController.java | 4 +- .../widget/RadioButtonPickerFragment.java | 4 +- .../settings/wifi/AddNetworkFragment.java | 4 +- .../settings/wifi/ButtonPreference.java | 6 +- .../settings/wifi/ChangeWifiStateDetails.java | 8 +-- .../settings/wifi/ConfigureWifiSettings.java | 4 +- .../wifi/NetworkRequestDialogFragment.java | 21 +++---- .../NetworkRequestErrorDialogFragment.java | 4 +- .../android/settings/wifi/WifiAPITest.java | 4 +- .../WifiConnectionPreferenceController.java | 6 +- src/com/android/settings/wifi/WifiDialog.java | 1 - .../android/settings/wifi/WifiEnabler.java | 6 +- src/com/android/settings/wifi/WifiInfo.java | 4 +- .../settings/wifi/WifiScanModeActivity.java | 4 +- .../wifi/WifiScanningRequiredFragment.java | 4 +- .../android/settings/wifi/WifiSettings.java | 14 ++--- .../wifi/calling/WifiCallingSettings.java | 4 +- .../calling/WifiCallingSettingsForSub.java | 4 +- .../WifiDetailPreferenceController.java | 9 ++- .../details/WifiNetworkDetailsFragment.java | 7 +-- .../wifi/dpp/WifiDppAddDeviceFragment.java | 5 +- ...WifiDppChooseSavedWifiNetworkFragment.java | 4 +- .../wifi/dpp/WifiDppConfiguratorActivity.java | 6 +- .../wifi/dpp/WifiDppEnrolleeActivity.java | 12 ++-- .../wifi/dpp/WifiDppQrCodeBaseFragment.java | 1 - .../dpp/WifiDppQrCodeGeneratorFragment.java | 4 +- .../dpp/WifiDppQrCodeScannerFragment.java | 8 +-- .../wifi/dpp/WifiNetworkListFragment.java | 14 ++--- .../android/settings/wifi/dpp/WifiQrCode.java | 1 - .../settings/wifi/p2p/WifiP2pSettings.java | 12 ++-- .../settings/wifi/qrcode/QrCamera.java | 7 ++- .../settings/wifi/qrcode/QrDecorateView.java | 3 - .../settings/wifi/qrcode/QrPreviewLayout.java | 1 - .../SavedAccessPointsWifiSettings.java | 7 +-- .../settings/wifi/slice/WifiSlice.java | 6 +- .../WifiTetherSSIDPreferenceController.java | 1 - .../wifi/tether/WifiTetherSettings.java | 4 +- 502 files changed, 1184 insertions(+), 1347 deletions(-) diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java index f14409624d3..dde7ce0fcf6 100644 --- a/src/com/android/settings/AirplaneModeEnabler.java +++ b/src/com/android/settings/AirplaneModeEnabler.java @@ -16,6 +16,7 @@ package com.android.settings; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.database.ContentObserver; @@ -26,7 +27,6 @@ import android.os.SystemProperties; import android.os.UserHandle; import android.provider.Settings; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneStateIntentReceiver; import com.android.internal.telephony.TelephonyProperties; import com.android.settingslib.WirelessUtils; @@ -129,7 +129,7 @@ public class AirplaneModeEnabler { SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) { // In ECM mode, do not update database at this point } else { - mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_AIRPLANE_TOGGLE, + mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_AIRPLANE_TOGGLE, isAirplaneModeOn); setAirplaneModeOn(isAirplaneModeOn); } diff --git a/src/com/android/settings/BandMode.java b/src/com/android/settings/BandMode.java index bae8860005d..6987d92e949 100644 --- a/src/com/android/settings/BandMode.java +++ b/src/com/android/settings/BandMode.java @@ -9,7 +9,6 @@ import android.os.Message; import android.util.Log; import android.view.View; import android.view.Window; -import android.view.WindowManager; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.ListView; diff --git a/src/com/android/settings/BugreportPreference.java b/src/com/android/settings/BugreportPreference.java index 1da985cfc0b..1652ad24c7b 100644 --- a/src/com/android/settings/BugreportPreference.java +++ b/src/com/android/settings/BugreportPreference.java @@ -17,6 +17,7 @@ package com.android.settings; import android.app.ActivityManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.os.RemoteException; @@ -28,7 +29,6 @@ import android.widget.TextView; import androidx.appcompat.app.AlertDialog.Builder; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.CustomDialogPreferenceCompat; @@ -85,12 +85,12 @@ public class BugreportPreference extends CustomDialogPreferenceCompat { if (mFullTitle.isChecked()) { Log.v(TAG, "Taking full bugreport right away"); FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context, - MetricsEvent.ACTION_BUGREPORT_FROM_SETTINGS_FULL); + SettingsEnums.ACTION_BUGREPORT_FROM_SETTINGS_FULL); takeBugreport(ActivityManager.BUGREPORT_OPTION_FULL); } else { Log.v(TAG, "Taking interactive bugreport right away"); FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context, - MetricsEvent.ACTION_BUGREPORT_FROM_SETTINGS_INTERACTIVE); + SettingsEnums.ACTION_BUGREPORT_FROM_SETTINGS_INTERACTIVE); takeBugreport(ActivityManager.BUGREPORT_OPTION_INTERACTIVE); } } diff --git a/src/com/android/settings/CryptKeeperConfirm.java b/src/com/android/settings/CryptKeeperConfirm.java index 227120089ee..248494877d3 100644 --- a/src/com/android/settings/CryptKeeperConfirm.java +++ b/src/com/android/settings/CryptKeeperConfirm.java @@ -19,6 +19,7 @@ package com.android.settings; import android.annotation.Nullable; import android.app.Activity; import android.app.StatusBarManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -34,7 +35,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.core.InstrumentedFragment; @@ -46,7 +46,7 @@ public class CryptKeeperConfirm extends InstrumentedFragment { @Override public int getMetricsCategory() { - return MetricsEvent.CRYPT_KEEPER_CONFIRM; + return SettingsEnums.CRYPT_KEEPER_CONFIRM; } public static class Blank extends Activity { diff --git a/src/com/android/settings/CustomListPreference.java b/src/com/android/settings/CustomListPreference.java index 734cac23fcd..978858b1bc3 100644 --- a/src/com/android/settings/CustomListPreference.java +++ b/src/com/android/settings/CustomListPreference.java @@ -17,6 +17,7 @@ package com.android.settings; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; @@ -30,7 +31,6 @@ import androidx.fragment.app.FragmentTransaction; import androidx.preference.ListPreference; import androidx.preference.ListPreferenceDialogFragmentCompat; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; public class CustomListPreference extends ListPreference { @@ -221,7 +221,7 @@ public class CustomListPreference extends ListPreference { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_CUSTOM_LIST_CONFIRMATION; + return SettingsEnums.DIALOG_CUSTOM_LIST_CONFIRMATION; } } } diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java index 05dd265891e..40b20052ab5 100644 --- a/src/com/android/settings/DateTimeSettings.java +++ b/src/com/android/settings/DateTimeSettings.java @@ -18,11 +18,11 @@ package com.android.settings; import android.app.Activity; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.datetime.AutoTimeFormatPreferenceController; @@ -54,7 +54,7 @@ public class DateTimeSettings extends DashboardFragment implements @Override public int getMetricsCategory() { - return MetricsEvent.DATE_TIME; + return SettingsEnums.DATE_TIME; } @Override @@ -127,9 +127,9 @@ public class DateTimeSettings extends DashboardFragment implements public int getDialogMetricsCategory(int dialogId) { switch (dialogId) { case DatePreferenceController.DIALOG_DATEPICKER: - return MetricsEvent.DIALOG_DATE_PICKER; + return SettingsEnums.DIALOG_DATE_PICKER; case TimePreferenceController.DIALOG_TIMEPICKER: - return MetricsEvent.DIALOG_TIME_PICKER; + return SettingsEnums.DIALOG_TIME_PICKER; default: return 0; } diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index fdd7f2e46b3..b67e6e84f3a 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -16,10 +16,10 @@ package com.android.settings; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.display.BrightnessLevelPreferenceController; import com.android.settings.display.CameraGesturePreferenceController; @@ -49,7 +49,7 @@ public class DisplaySettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.DISPLAY; + return SettingsEnums.DISPLAY; } @Override diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java index 6060892ef83..e80b6d37909 100644 --- a/src/com/android/settings/EncryptionInterstitial.java +++ b/src/com/android/settings/EncryptionInterstitial.java @@ -20,6 +20,7 @@ import android.accessibilityservice.AccessibilityServiceInfo; import android.app.Activity; import android.app.Dialog; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -35,7 +36,6 @@ import android.widget.TextView; import androidx.appcompat.app.AlertDialog; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.password.ChooseLockSettingsHelper; @@ -96,7 +96,7 @@ public class EncryptionInterstitial extends SettingsActivity { @Override public int getMetricsCategory() { - return MetricsEvent.ENCRYPTION; + return SettingsEnums.ENCRYPTION; } @Override @@ -281,7 +281,7 @@ public class EncryptionInterstitial extends SettingsActivity { @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_ENCRYPTION_INTERSTITIAL_ACCESSIBILITY; + return SettingsEnums.DIALOG_ENCRYPTION_INTERSTITIAL_ACCESSIBILITY; } @Override diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java index 1de7a10fe27..1133d0f3ab5 100644 --- a/src/com/android/settings/IccLockSettings.java +++ b/src/com/android/settings/IccLockSettings.java @@ -16,6 +16,7 @@ package com.android.settings; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -50,7 +51,6 @@ import android.widget.Toast; import androidx.preference.Preference; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.CommandException; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneFactory; @@ -279,7 +279,7 @@ public class IccLockSettings extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.ICC_LOCK; + return SettingsEnums.ICC_LOCK; } @Override diff --git a/src/com/android/settings/LegalSettings.java b/src/com/android/settings/LegalSettings.java index 3538cc9ef8f..e6f0c2c0735 100644 --- a/src/com/android/settings/LegalSettings.java +++ b/src/com/android/settings/LegalSettings.java @@ -16,10 +16,10 @@ package com.android.settings; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -35,7 +35,7 @@ public class LegalSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.ABOUT_LEGAL_SETTINGS; + return SettingsEnums.ABOUT_LEGAL_SETTINGS; } @Override diff --git a/src/com/android/settings/ManualDisplayActivity.java b/src/com/android/settings/ManualDisplayActivity.java index 8effc7b9ffe..a669c678114 100644 --- a/src/com/android/settings/ManualDisplayActivity.java +++ b/src/com/android/settings/ManualDisplayActivity.java @@ -22,7 +22,6 @@ import android.content.Intent; import android.content.res.Resources; import android.net.Uri; import android.os.Bundle; -import android.text.TextUtils; import android.util.Log; import android.widget.Toast; diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java index c03d499bdbb..f9e4317ecec 100644 --- a/src/com/android/settings/MasterClear.java +++ b/src/com/android/settings/MasterClear.java @@ -23,6 +23,7 @@ import android.accounts.AccountManager; import android.accounts.AuthenticatorDescription; import android.app.ActionBar; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; @@ -57,7 +58,6 @@ import android.widget.TextView; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.SubSettingLauncher; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; @@ -565,6 +565,6 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL @Override public int getMetricsCategory() { - return MetricsEvent.MASTER_CLEAR; + return SettingsEnums.MASTER_CLEAR; } } diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java index cbd492473c2..de7cd06924a 100644 --- a/src/com/android/settings/MasterClearConfirm.java +++ b/src/com/android/settings/MasterClearConfirm.java @@ -22,6 +22,7 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import android.app.ActionBar; import android.app.Activity; import android.app.ProgressDialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; @@ -39,7 +40,6 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.InstrumentedFragment; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settingslib.RestrictedLockUtilsInternal; @@ -225,6 +225,6 @@ public class MasterClearConfirm extends InstrumentedFragment { @Override public int getMetricsCategory() { - return MetricsEvent.MASTER_CLEAR_CONFIRM; + return SettingsEnums.MASTER_CLEAR_CONFIRM; } } diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java index 4bd458541c5..625369e7915 100644 --- a/src/com/android/settings/ProxySelector.java +++ b/src/com/android/settings/ProxySelector.java @@ -19,6 +19,7 @@ package com.android.settings; import android.app.Activity; import android.app.Dialog; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.net.ConnectivityManager; @@ -40,7 +41,6 @@ import android.widget.TextView; import androidx.appcompat.app.AlertDialog; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment; import com.android.settings.core.InstrumentedFragment; @@ -106,7 +106,7 @@ public class ProxySelector extends InstrumentedFragment implements DialogCreatab @Override public int getDialogMetricsCategory(int dialogId) { - return MetricsEvent.DIALOG_PROXY_SELECTOR_ERROR; + return SettingsEnums.DIALOG_PROXY_SELECTOR_ERROR; } private void showDialog(int dialogId) { @@ -277,6 +277,6 @@ public class ProxySelector extends InstrumentedFragment implements DialogCreatab @Override public int getMetricsCategory() { - return MetricsEvent.PROXY_SELECTOR; + return SettingsEnums.PROXY_SELECTOR; } } diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java index 9ad8a9832aa..bd45f9bd3c3 100644 --- a/src/com/android/settings/ResetNetwork.java +++ b/src/com/android/settings/ResetNetwork.java @@ -18,6 +18,7 @@ package com.android.settings; import android.annotation.Nullable; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; @@ -41,14 +42,12 @@ import android.widget.CheckBox; import android.widget.Spinner; import android.widget.TextView; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.SubSettingLauncher; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.ConfirmLockPattern; -import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedLockUtilsInternal; @@ -263,6 +262,6 @@ public class ResetNetwork extends InstrumentedFragment { @Override public int getMetricsCategory() { - return MetricsEvent.RESET_NETWORK; + return SettingsEnums.RESET_NETWORK; } } diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java index 270f22b6f5c..7c21b55c0d8 100644 --- a/src/com/android/settings/ResetNetworkConfirm.java +++ b/src/com/android/settings/ResetNetworkConfirm.java @@ -18,6 +18,7 @@ package com.android.settings; import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; +import android.app.settings.SettingsEnums; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothManager; import android.content.ContentResolver; @@ -45,12 +46,10 @@ import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; import com.android.ims.ImsManager; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; import com.android.settings.core.InstrumentedFragment; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settings.network.ApnSettings; -import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtilsInternal; /** @@ -262,6 +261,6 @@ public class ResetNetworkConfirm extends InstrumentedFragment { @Override public int getMetricsCategory() { - return MetricsEvent.RESET_NETWORK_CONFIRM; + return SettingsEnums.RESET_NETWORK_CONFIRM; } } diff --git a/src/com/android/settings/RestrictedSettingsFragment.java b/src/com/android/settings/RestrictedSettingsFragment.java index 13bc9c51147..6b538b81f21 100644 --- a/src/com/android/settings/RestrictedSettingsFragment.java +++ b/src/com/android/settings/RestrictedSettingsFragment.java @@ -36,7 +36,6 @@ import androidx.appcompat.app.AlertDialog; import com.android.settings.dashboard.RestrictedDashboardFragment; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; -import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtilsInternal; /** diff --git a/src/com/android/settings/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java index 6f620578ced..6def6faebd0 100644 --- a/src/com/android/settings/SettingsLicenseActivity.java +++ b/src/com/android/settings/SettingsLicenseActivity.java @@ -21,7 +21,6 @@ import android.content.ContentResolver; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.text.TextUtils; import android.util.Log; import android.widget.Toast; diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java index 1b911c72abc..70ee2ca0bf5 100644 --- a/src/com/android/settings/SetupWizardUtils.java +++ b/src/com/android/settings/SetupWizardUtils.java @@ -19,8 +19,6 @@ package com.android.settings; import android.content.Intent; import android.sysprop.SetupWizardProperties; -import androidx.annotation.VisibleForTesting; - import com.google.android.setupcompat.util.WizardManagerHelper; import com.google.android.setupdesign.util.ThemeHelper; diff --git a/src/com/android/settings/TestingSettings.java b/src/com/android/settings/TestingSettings.java index ff58f11ede9..c1df70520d4 100644 --- a/src/com/android/settings/TestingSettings.java +++ b/src/com/android/settings/TestingSettings.java @@ -16,13 +16,12 @@ package com.android.settings; +import android.app.settings.SettingsEnums; import android.os.Bundle; import android.os.UserManager; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; - public class TestingSettings extends SettingsPreferenceFragment { @Override @@ -41,6 +40,6 @@ public class TestingSettings extends SettingsPreferenceFragment { @Override public int getMetricsCategory() { - return MetricsEvent.TESTING; + return SettingsEnums.TESTING; } } diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java index d32e387ae46..20b6e2f7efb 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -20,6 +20,7 @@ import static android.net.ConnectivityManager.TETHERING_BLUETOOTH; import static android.net.ConnectivityManager.TETHERING_USB; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothPan; import android.bluetooth.BluetoothProfile; @@ -40,7 +41,6 @@ import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.datausage.DataSaverBackend; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -101,7 +101,7 @@ public class TetherSettings extends RestrictedSettingsFragment @Override public int getMetricsCategory() { - return MetricsEvent.TETHER; + return SettingsEnums.TETHER; } public TetherSettings() { diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java index ff217f6be9c..ae25ba939f6 100644 --- a/src/com/android/settings/TrustedCredentialsSettings.java +++ b/src/com/android/settings/TrustedCredentialsSettings.java @@ -24,6 +24,7 @@ import android.annotation.UiThread; import android.app.Activity; import android.app.KeyguardManager; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.Context; import android.content.DialogInterface; @@ -63,7 +64,6 @@ import android.widget.TextView; import com.android.internal.annotations.GuardedBy; import com.android.internal.app.UnlaunchableAppActivity; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.core.InstrumentedFragment; @@ -93,7 +93,7 @@ public class TrustedCredentialsSettings extends InstrumentedFragment @Override public int getMetricsCategory() { - return MetricsEvent.TRUSTED_CREDENTIALS; + return SettingsEnums.TRUSTED_CREDENTIALS; } private enum Tab { diff --git a/src/com/android/settings/UserCredentialsSettings.java b/src/com/android/settings/UserCredentialsSettings.java index b1f9fe74d6f..c30e51df668 100644 --- a/src/com/android/settings/UserCredentialsSettings.java +++ b/src/com/android/settings/UserCredentialsSettings.java @@ -19,6 +19,7 @@ package com.android.settings; import android.annotation.LayoutRes; import android.annotation.Nullable; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.os.AsyncTask; @@ -48,7 +49,6 @@ import androidx.fragment.app.DialogFragment; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.RecyclerView; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settingslib.RestrictedLockUtils; @@ -68,7 +68,7 @@ public class UserCredentialsSettings extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.USER_CREDENTIALS; + return SettingsEnums.USER_CREDENTIALS; } @Override @@ -165,7 +165,7 @@ public class UserCredentialsSettings extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_USER_CREDENTIAL; + return SettingsEnums.DIALOG_USER_CREDENTIAL; } /** diff --git a/src/com/android/settings/accessibility/AccessibilityContentTimeoutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityContentTimeoutPreferenceFragment.java index 4fc61591d54..8a41bd49bfd 100644 --- a/src/com/android/settings/accessibility/AccessibilityContentTimeoutPreferenceFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityContentTimeoutPreferenceFragment.java @@ -16,17 +16,16 @@ package com.android.settings.accessibility; -import android.provider.SearchIndexableResource; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.res.Resources; +import android.provider.SearchIndexableResource; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.search.SearchIndexable; @@ -71,7 +70,7 @@ public final class AccessibilityContentTimeoutPreferenceFragment extends Dashboa @Override public int getMetricsCategory() { - return MetricsEvent.ACCESSIBILITY; + return SettingsEnums.ACCESSIBILITY; } @Override diff --git a/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java index 56424af36c0..a6426bfe502 100644 --- a/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java @@ -16,17 +16,16 @@ package com.android.settings.accessibility; -import android.provider.SearchIndexableResource; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.res.Resources; +import android.provider.SearchIndexableResource; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.search.SearchIndexable; @@ -71,7 +70,7 @@ public final class AccessibilityControlTimeoutPreferenceFragment extends Dashboa @Override public int getMetricsCategory() { - return MetricsEvent.ACCESSIBILITY; + return SettingsEnums.ACCESSIBILITY; } @Override diff --git a/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java index b9713d7e8b0..a94bc6d879d 100644 --- a/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java +++ b/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.accessibility; +import android.app.settings.SettingsEnums; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothHearingAid; @@ -33,7 +34,6 @@ import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment; import com.android.settings.core.BasePreferenceController; @@ -204,7 +204,7 @@ public class AccessibilityHearingAidPreferenceController extends BasePreferenceC .setDestination(BluetoothDeviceDetailsFragment.class.getName()) .setArguments(args) .setTitleRes(R.string.device_details_title) - .setSourceMetricsCategory(MetricsProto.MetricsEvent.ACCESSIBILITY) + .setSourceMetricsCategory(SettingsEnums.ACCESSIBILITY) .launch(); } diff --git a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java index e0f17473b35..dec734c4c6d 100644 --- a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java +++ b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java @@ -30,8 +30,6 @@ import android.view.MotionEvent; import android.view.View; import android.view.Window; import android.view.WindowManager; -import android.widget.ImageView; -import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; @@ -39,7 +37,6 @@ import androidx.appcompat.app.AlertDialog; import com.android.settings.R; -import java.util.List; import java.util.Locale; /** diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index 6f6149f98d8..ebae69c47ac 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -20,6 +20,7 @@ import static android.os.Vibrator.VibrationIntensity; import android.accessibilityservice.AccessibilityServiceInfo; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; @@ -50,7 +51,6 @@ import androidx.preference.SwitchPreference; import com.android.internal.accessibility.AccessibilityShortcutController; import com.android.internal.content.PackageMonitor; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.view.RotationPolicy; import com.android.internal.view.RotationPolicy.RotationPolicyListener; import com.android.settings.R; @@ -272,7 +272,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements @Override public int getMetricsCategory() { - return MetricsEvent.ACCESSIBILITY; + return SettingsEnums.ACCESSIBILITY; } @Override diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java index 9ee155f97b7..46a6371f545 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java @@ -17,6 +17,7 @@ package com.android.settings.accessibility; import android.accessibilityservice.AccessibilityServiceInfo; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; import android.content.pm.ServiceInfo; @@ -26,7 +27,6 @@ import android.view.accessibility.AccessibilityManager; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -60,7 +60,7 @@ public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragm @Override public int getMetricsCategory() { - return MetricsEvent.SUW_ACCESSIBILITY; + return SettingsEnums.SUW_ACCESSIBILITY; } @Override diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java index 3cd260fc4b9..de65324f388 100644 --- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java @@ -17,6 +17,7 @@ package com.android.settings.accessibility; import android.accessibilityservice.AccessibilityServiceInfo; import android.annotation.Nullable; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; @@ -32,7 +33,6 @@ import androidx.preference.Preference; import androidx.preference.SwitchPreference; import com.android.internal.accessibility.AccessibilityShortcutController; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -60,7 +60,7 @@ public class AccessibilityShortcutPreferenceFragment extends ToggleFeaturePrefer @Override public int getMetricsCategory() { - return MetricsEvent.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE; + return SettingsEnums.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE; } @Override diff --git a/src/com/android/settings/accessibility/AccessibilityTimeoutController.java b/src/com/android/settings/accessibility/AccessibilityTimeoutController.java index d933d923b21..a6c5f6fe6ce 100644 --- a/src/com/android/settings/accessibility/AccessibilityTimeoutController.java +++ b/src/com/android/settings/accessibility/AccessibilityTimeoutController.java @@ -33,8 +33,6 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import com.google.common.primitives.Ints; -import java.lang.Integer; - import java.util.HashMap; import java.util.Map; diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java index 33cb95ec319..ae7e3fdb4fb 100644 --- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java +++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java @@ -16,6 +16,7 @@ package com.android.settings.accessibility; +import android.app.settings.SettingsEnums; import android.content.ContentResolver; import android.content.Context; import android.content.res.Resources; @@ -36,7 +37,6 @@ import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceCategory; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.SubtitleView; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -99,7 +99,7 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.ACCESSIBILITY_CAPTION_PROPERTIES; + return SettingsEnums.ACCESSIBILITY_CAPTION_PROPERTIES; } @Override diff --git a/src/com/android/settings/accessibility/HearingAidDialogFragment.java b/src/com/android/settings/accessibility/HearingAidDialogFragment.java index 0380ed3881f..aa80564cce3 100644 --- a/src/com/android/settings/accessibility/HearingAidDialogFragment.java +++ b/src/com/android/settings/accessibility/HearingAidDialogFragment.java @@ -18,10 +18,10 @@ package com.android.settings.accessibility; import android.app.AlertDialog; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.os.Bundle; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.bluetooth.BluetoothPairingDetail; import com.android.settings.core.SubSettingLauncher; @@ -53,13 +53,13 @@ public class HearingAidDialogFragment extends InstrumentedDialogFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_ACCESSIBILITY_HEARINGAID; + return SettingsEnums.DIALOG_ACCESSIBILITY_HEARINGAID; } private void launchBluetoothAddDeviceSetting() { new SubSettingLauncher(getActivity()) .setDestination(BluetoothPairingDetail.class.getName()) - .setSourceMetricsCategory(MetricsProto.MetricsEvent.ACCESSIBILITY) + .setSourceMetricsCategory(SettingsEnums.ACCESSIBILITY) .launch(); } } diff --git a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java index 31b23fa1d4b..c3cb34fbcbc 100644 --- a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java @@ -17,6 +17,7 @@ package com.android.settings.accessibility; import android.accessibilityservice.AccessibilityServiceInfo; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; @@ -30,7 +31,6 @@ import android.view.accessibility.AccessibilityManager; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -62,7 +62,7 @@ public final class MagnificationPreferenceFragment extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.ACCESSIBILITY_SCREEN_MAGNIFICATION_SETTINGS; + return SettingsEnums.ACCESSIBILITY_SCREEN_MAGNIFICATION_SETTINGS; } @Override diff --git a/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java b/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java index ba7d51d26bf..3ca197ffb17 100644 --- a/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java @@ -15,11 +15,11 @@ */ package com.android.settings.accessibility; +import android.app.settings.SettingsEnums; import android.media.AudioAttributes; import android.os.Vibrator; import android.provider.Settings; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; /** @@ -28,7 +28,7 @@ import com.android.settings.R; public class NotificationVibrationPreferenceFragment extends VibrationPreferenceFragment { @Override public int getMetricsCategory() { - return MetricsEvent.ACCESSIBILITY_VIBRATION_NOTIFICATION; + return SettingsEnums.ACCESSIBILITY_VIBRATION_NOTIFICATION; } @Override diff --git a/src/com/android/settings/accessibility/RingVibrationPreferenceFragment.java b/src/com/android/settings/accessibility/RingVibrationPreferenceFragment.java index df05231cb68..3403b3bc351 100644 --- a/src/com/android/settings/accessibility/RingVibrationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/RingVibrationPreferenceFragment.java @@ -15,11 +15,11 @@ */ package com.android.settings.accessibility; +import android.app.settings.SettingsEnums; import android.media.AudioAttributes; import android.os.Vibrator; import android.provider.Settings; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; /** @@ -28,7 +28,7 @@ import com.android.settings.R; public class RingVibrationPreferenceFragment extends VibrationPreferenceFragment { @Override public int getMetricsCategory() { - return MetricsEvent.ACCESSIBILITY_VIBRATION_RING; + return SettingsEnums.ACCESSIBILITY_VIBRATION_RING; } @Override diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java index 213bfbd62d6..2da4f7a2600 100644 --- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java +++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java @@ -17,13 +17,12 @@ package com.android.settings.accessibility; import static android.content.DialogInterface.BUTTON_POSITIVE; -import static com.android.internal.accessibility.AccessibilityShortcutController - .COLOR_INVERSION_COMPONENT_NAME; -import static com.android.internal.accessibility.AccessibilityShortcutController - .DALTONIZER_COMPONENT_NAME; +import static com.android.internal.accessibility.AccessibilityShortcutController.COLOR_INVERSION_COMPONENT_NAME; +import static com.android.internal.accessibility.AccessibilityShortcutController.DALTONIZER_COMPONENT_NAME; import android.accessibilityservice.AccessibilityServiceInfo; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; import android.content.DialogInterface; @@ -43,9 +42,7 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import com.android.internal.accessibility.AccessibilityShortcutController; -import com.android.internal.accessibility.AccessibilityShortcutController - .ToggleableFrameworkFeatureInfo; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.internal.accessibility.AccessibilityShortcutController.ToggleableFrameworkFeatureInfo; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.widget.RadioButtonPickerFragment; @@ -64,7 +61,7 @@ public class ShortcutServicePickerFragment extends RadioButtonPickerFragment { @Override public int getMetricsCategory() { - return MetricsEvent.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE; + return SettingsEnums.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE; } @Override @@ -169,7 +166,7 @@ public class ShortcutServicePickerFragment extends RadioButtonPickerFragment { @Override public int getMetricsCategory() { - return MetricsEvent.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE; + return SettingsEnums.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE; } @Override diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java index c0df6a344da..d935d929420 100644 --- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java @@ -20,6 +20,7 @@ import android.accessibilityservice.AccessibilityServiceInfo; import android.app.Activity; import android.app.Dialog; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.DialogInterface; import android.content.Intent; @@ -37,7 +38,6 @@ import android.view.accessibility.AccessibilityManager; import androidx.appcompat.app.AlertDialog; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.password.ConfirmDeviceCredentialActivity; @@ -71,7 +71,7 @@ public class ToggleAccessibilityServicePreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.ACCESSIBILITY_SERVICE; + return SettingsEnums.ACCESSIBILITY_SERVICE; } @Override @@ -163,9 +163,9 @@ public class ToggleAccessibilityServicePreferenceFragment @Override public int getDialogMetricsCategory(int dialogId) { if (dialogId == DIALOG_ID_ENABLE_WARNING) { - return MetricsEvent.DIALOG_ACCESSIBILITY_SERVICE_ENABLE; + return SettingsEnums.DIALOG_ACCESSIBILITY_SERVICE_ENABLE; } else { - return MetricsEvent.DIALOG_ACCESSIBILITY_SERVICE_DISABLE; + return SettingsEnums.DIALOG_ACCESSIBILITY_SERVICE_DISABLE; } } diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java index a9c7781cf8d..8e12339f793 100644 --- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java @@ -16,6 +16,7 @@ package com.android.settings.accessibility; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.res.Resources; import android.os.Bundle; @@ -26,7 +27,6 @@ import android.widget.Switch; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -109,7 +109,7 @@ public class ToggleAutoclickPreferenceFragment extends ToggleFeaturePreferenceFr @Override public int getMetricsCategory() { - return MetricsEvent.ACCESSIBILITY_TOGGLE_AUTOCLICK; + return SettingsEnums.ACCESSIBILITY_TOGGLE_AUTOCLICK; } @Override diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java index 184c615480e..239eda3e934 100644 --- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java @@ -16,6 +16,7 @@ package com.android.settings.accessibility; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; @@ -26,7 +27,6 @@ import android.widget.Switch; import androidx.preference.ListPreference; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -47,7 +47,7 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF @Override public int getMetricsCategory() { - return MetricsEvent.ACCESSIBILITY_TOGGLE_DALTONIZER; + return SettingsEnums.ACCESSIBILITY_TOGGLE_DALTONIZER; } @Override diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java index 99ed7a1494f..5ed5169f1b7 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java @@ -16,6 +16,7 @@ package com.android.settings.accessibility; +import android.app.settings.SettingsEnums; import android.content.ContentResolver; import android.content.Context; import android.content.res.Resources; @@ -37,7 +38,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceViewHolder; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.widget.SwitchBar; @@ -164,7 +164,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends @Override public int getMetricsCategory() { // TODO: Distinguish between magnification modes - return MetricsEvent.ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION; + return SettingsEnums.ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION; } @Override diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java index 48a05694c3a..5fe62a7e021 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java @@ -16,16 +16,15 @@ package com.android.settings.accessibility; +import android.app.settings.SettingsEnums; import android.os.Bundle; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; - public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard extends ToggleScreenMagnificationPreferenceFragment { @Override public int getMetricsCategory() { - return MetricsEvent.SUW_ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION; + return SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION; } @Override @@ -36,7 +35,7 @@ public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard if (mToggleSwitch.isChecked() != args.getBoolean(AccessibilitySettings.EXTRA_CHECKED)) { // TODO: Distinguish between magnification modes mMetricsFeatureProvider.action(getContext(), - MetricsEvent.SUW_ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION, + SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION, mToggleSwitch.isChecked()); } } diff --git a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java index 9bd25982857..fc68e031e0c 100644 --- a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java @@ -16,10 +16,9 @@ package com.android.settings.accessibility; +import android.app.settings.SettingsEnums; import android.os.Bundle; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; - public class ToggleScreenReaderPreferenceFragmentForSetupWizard extends ToggleAccessibilityServicePreferenceFragment { @@ -33,7 +32,7 @@ public class ToggleScreenReaderPreferenceFragmentForSetupWizard @Override public int getMetricsCategory() { - return MetricsEvent.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER; + return SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER; } @Override @@ -41,7 +40,7 @@ public class ToggleScreenReaderPreferenceFragmentForSetupWizard // Log the final choice in value if it's different from the previous value. if (mToggleSwitch.isChecked() != mToggleSwitchWasInitiallyChecked) { mMetricsFeatureProvider.action(getContext(), - MetricsEvent.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER, mToggleSwitch.isChecked()); + SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER, mToggleSwitch.isChecked()); } super.onStop(); diff --git a/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java index 2c9b58c6625..be9e8d43cb1 100644 --- a/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java @@ -16,10 +16,9 @@ package com.android.settings.accessibility; +import android.app.settings.SettingsEnums; import android.os.Bundle; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; - public class ToggleSelectToSpeakPreferenceFragmentForSetupWizard extends ToggleAccessibilityServicePreferenceFragment { @@ -33,7 +32,7 @@ public class ToggleSelectToSpeakPreferenceFragmentForSetupWizard @Override public int getMetricsCategory() { - return MetricsEvent.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER; + return SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER; } @Override @@ -41,7 +40,7 @@ public class ToggleSelectToSpeakPreferenceFragmentForSetupWizard // Log the final choice in value if it's different from the previous value. if (mToggleSwitch.isChecked() != mToggleSwitchWasInitiallyChecked) { mMetricsFeatureProvider.action(getContext(), - MetricsEvent.SUW_ACCESSIBILITY_TOGGLE_SELECT_TO_SPEAK, + SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SELECT_TO_SPEAK, mToggleSwitch.isChecked()); } diff --git a/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java b/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java index 52fd069956b..f6bbbf3f120 100644 --- a/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java @@ -15,11 +15,11 @@ */ package com.android.settings.accessibility; +import android.app.settings.SettingsEnums; import android.media.AudioAttributes; import android.os.Vibrator; import android.provider.Settings; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; /** @@ -28,7 +28,7 @@ import com.android.settings.R; public class TouchVibrationPreferenceFragment extends VibrationPreferenceFragment { @Override public int getMetricsCategory() { - return MetricsEvent.ACCESSIBILITY_VIBRATION_TOUCH; + return SettingsEnums.ACCESSIBILITY_VIBRATION_TOUCH; } @Override diff --git a/src/com/android/settings/accessibility/VibrationSettings.java b/src/com/android/settings/accessibility/VibrationSettings.java index 37207e743eb..9d31220120e 100644 --- a/src/com/android/settings/accessibility/VibrationSettings.java +++ b/src/com/android/settings/accessibility/VibrationSettings.java @@ -16,10 +16,10 @@ package com.android.settings.accessibility; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -38,7 +38,7 @@ public class VibrationSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.ACCESSIBILITY_VIBRATION; + return SettingsEnums.ACCESSIBILITY_VIBRATION; } @Override diff --git a/src/com/android/settings/accounts/AccountDashboardFragment.java b/src/com/android/settings/accounts/AccountDashboardFragment.java index c1499ce5b20..515008af596 100644 --- a/src/com/android/settings/accounts/AccountDashboardFragment.java +++ b/src/com/android/settings/accounts/AccountDashboardFragment.java @@ -17,10 +17,10 @@ package com.android.settings.accounts; import static android.provider.Settings.EXTRA_AUTHORITIES; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.dashboard.DashboardFragment; @@ -43,7 +43,7 @@ public class AccountDashboardFragment extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.ACCOUNT; + return SettingsEnums.ACCOUNT; } @Override diff --git a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java index e13d3ebbee6..4b612384250 100644 --- a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java +++ b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java @@ -18,6 +18,7 @@ package com.android.settings.accounts; import android.accounts.Account; import android.accounts.AccountManager; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.os.UserHandle; @@ -26,7 +27,6 @@ import android.os.UserManager; import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.dashboard.DashboardFragment; @@ -113,7 +113,7 @@ public class AccountDetailDashboardFragment extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.ACCOUNT; + return SettingsEnums.ACCOUNT; } @Override diff --git a/src/com/android/settings/accounts/AccountFeatureProvider.java b/src/com/android/settings/accounts/AccountFeatureProvider.java index ef14fa0adf0..9829ca64b4c 100644 --- a/src/com/android/settings/accounts/AccountFeatureProvider.java +++ b/src/com/android/settings/accounts/AccountFeatureProvider.java @@ -18,7 +18,6 @@ package com.android.settings.accounts; import android.accounts.Account; import android.content.Context; -import android.content.Intent; public interface AccountFeatureProvider { String getAccountType(); diff --git a/src/com/android/settings/accounts/AccountSyncPreferenceController.java b/src/com/android/settings/accounts/AccountSyncPreferenceController.java index 6d58bb884d5..cea88439734 100644 --- a/src/com/android/settings/accounts/AccountSyncPreferenceController.java +++ b/src/com/android/settings/accounts/AccountSyncPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.accounts; import static android.content.Intent.EXTRA_USER; import android.accounts.Account; +import android.app.settings.SettingsEnums; import android.content.ContentResolver; import android.content.Context; import android.content.SyncAdapterType; @@ -29,7 +30,6 @@ import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.SubSettingLauncher; @@ -66,7 +66,7 @@ public class AccountSyncPreferenceController extends AbstractPreferenceControlle new SubSettingLauncher(mContext) .setDestination(AccountSyncSettings.class.getName()) .setArguments(args) - .setSourceMetricsCategory( MetricsProto.MetricsEvent.ACCOUNT) + .setSourceMetricsCategory( SettingsEnums.ACCOUNT) .setTitleRes( R.string.account_sync_title) .launch(); diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java index 8a33e6c1216..00329893d27 100644 --- a/src/com/android/settings/accounts/AccountSyncSettings.java +++ b/src/com/android/settings/accounts/AccountSyncSettings.java @@ -20,6 +20,7 @@ import android.accounts.Account; import android.accounts.AccountManager; import android.app.Activity; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; @@ -44,7 +45,6 @@ import android.view.MenuItem; import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.widget.EntityHeaderController; @@ -80,14 +80,14 @@ public class AccountSyncSettings extends AccountPreferenceBase { @Override public int getMetricsCategory() { - return MetricsEvent.ACCOUNTS_ACCOUNT_SYNC; + return SettingsEnums.ACCOUNTS_ACCOUNT_SYNC; } @Override public int getDialogMetricsCategory(int dialogId) { switch (dialogId) { case CANT_DO_ONETIME_SYNC_DIALOG: - return MetricsEvent.DIALOG_ACCOUNT_SYNC_CANNOT_ONETIME_SYNC; + return SettingsEnums.DIALOG_ACCOUNT_SYNC_CANNOT_ONETIME_SYNC; default: return 0; } diff --git a/src/com/android/settings/accounts/ChooseAccountFragment.java b/src/com/android/settings/accounts/ChooseAccountFragment.java index 98b9ee6c5e6..0d7956a3d3a 100644 --- a/src/com/android/settings/accounts/ChooseAccountFragment.java +++ b/src/com/android/settings/accounts/ChooseAccountFragment.java @@ -16,12 +16,12 @@ package com.android.settings.accounts; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.UserHandle; import android.os.UserManager; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.dashboard.DashboardFragment; @@ -43,7 +43,7 @@ public class ChooseAccountFragment extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.ACCOUNTS_CHOOSE_ACCOUNT_ACTIVITY; + return SettingsEnums.ACCOUNTS_CHOOSE_ACCOUNT_ACTIVITY; } @Override diff --git a/src/com/android/settings/accounts/CrossProfileCalendarPreferenceController.java b/src/com/android/settings/accounts/CrossProfileCalendarPreferenceController.java index 38c95dcc7ad..aa314d6974a 100644 --- a/src/com/android/settings/accounts/CrossProfileCalendarPreferenceController.java +++ b/src/com/android/settings/accounts/CrossProfileCalendarPreferenceController.java @@ -19,15 +19,13 @@ import android.content.Context; import android.os.UserHandle; import android.provider.Settings; -import com.android.settings.core.BasePreferenceController; +import androidx.preference.Preference; + import com.android.settings.core.TogglePreferenceController; -import com.android.settings.slices.SliceData; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.RestrictedSwitchPreference; -import androidx.preference.Preference; - public class CrossProfileCalendarPreferenceController extends TogglePreferenceController { private UserHandle mManagedUser; diff --git a/src/com/android/settings/accounts/ManagedProfileSettings.java b/src/com/android/settings/accounts/ManagedProfileSettings.java index dccd7f67499..a4105efa779 100644 --- a/src/com/android/settings/accounts/ManagedProfileSettings.java +++ b/src/com/android/settings/accounts/ManagedProfileSettings.java @@ -16,6 +16,7 @@ package com.android.settings.accounts; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -26,7 +27,6 @@ import android.os.UserManager; import android.provider.SearchIndexableResource; import android.util.Log; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.dashboard.DashboardFragment; @@ -105,7 +105,7 @@ public class ManagedProfileSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.ACCOUNTS_WORK_PROFILE_SETTINGS; + return SettingsEnums.ACCOUNTS_WORK_PROFILE_SETTINGS; } public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = diff --git a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java index 06eddd324e8..5523cced4c9 100644 --- a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java +++ b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java @@ -23,6 +23,7 @@ import android.accounts.AuthenticatorException; import android.accounts.OperationCanceledException; import android.app.Activity; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -37,7 +38,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -147,7 +147,7 @@ public class RemoveAccountPreferenceController extends AbstractPreferenceControl @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_ACCOUNT_SYNC_REMOVE; + return SettingsEnums.DIALOG_ACCOUNT_SYNC_REMOVE; } @Override @@ -210,7 +210,7 @@ public class RemoveAccountPreferenceController extends AbstractPreferenceControl @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_ACCOUNT_SYNC_FAILED_REMOVAL; + return SettingsEnums.DIALOG_ACCOUNT_SYNC_FAILED_REMOVAL; } } diff --git a/src/com/android/settings/accounts/RemoveUserFragment.java b/src/com/android/settings/accounts/RemoveUserFragment.java index 0fcf64fa8c4..0524b6317e3 100644 --- a/src/com/android/settings/accounts/RemoveUserFragment.java +++ b/src/com/android/settings/accounts/RemoveUserFragment.java @@ -17,12 +17,12 @@ package com.android.settings.accounts; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; import android.os.UserManager; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.users.UserDialogs; @@ -53,6 +53,6 @@ public class RemoveUserFragment extends InstrumentedDialogFragment { @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_REMOVE_USER; + return SettingsEnums.DIALOG_REMOVE_USER; } } diff --git a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java index 9ac3ecc4c9e..94c332f42e9 100644 --- a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java +++ b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java @@ -18,12 +18,12 @@ package com.android.settings.applications; import android.app.Activity; import android.app.Application; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; import androidx.fragment.app.Fragment; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.notification.EmergencyBroadcastPreferenceController; @@ -42,7 +42,7 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_APP_NOTIF_CATEGORY; + return SettingsEnums.SETTINGS_APP_NOTIF_CATEGORY; } @Override diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java index 7fb5787f7da..71043400ff8 100644 --- a/src/com/android/settings/applications/AppInfoBase.java +++ b/src/com/android/settings/applications/AppInfoBase.java @@ -21,6 +21,7 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import android.app.Activity; import android.app.Dialog; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -41,7 +42,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.Fragment; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.manageapplications.ManageApplications; @@ -241,7 +241,7 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_APP_INFO_ACTION; + return SettingsEnums.DIALOG_APP_INFO_ACTION; } @Override diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java index 3ccc36ff6ec..c61f5d126ad 100644 --- a/src/com/android/settings/applications/AppLaunchSettings.java +++ b/src/com/android/settings/applications/AppLaunchSettings.java @@ -19,8 +19,8 @@ package com.android.settings.applications; import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS; import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK; import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER; -import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED; +import android.app.settings.SettingsEnums; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.ApplicationInfo; @@ -40,7 +40,6 @@ import androidx.preference.DropDownPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; @@ -224,6 +223,6 @@ public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListe @Override public int getMetricsCategory() { - return MetricsEvent.APPLICATIONS_APP_LAUNCH; + return SettingsEnums.APPLICATIONS_APP_LAUNCH; } } diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java index 61293c58b67..56fa4555fd1 100644 --- a/src/com/android/settings/applications/AppStorageSettings.java +++ b/src/com/android/settings/applications/AppStorageSettings.java @@ -22,6 +22,7 @@ import static android.content.pm.ApplicationInfo.FLAG_SYSTEM; import android.app.ActivityManager; import android.app.AppGlobals; import android.app.GrantedUriPermission; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -49,7 +50,6 @@ import androidx.loader.content.Loader; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.deviceinfo.StorageWizardMoveConfirm; @@ -198,7 +198,7 @@ public class AppStorageSettings extends AppInfoWithHeader mClearCacheObserver = new ClearCacheObserver(); } mMetricsFeatureProvider.action(getContext(), - MetricsEvent.ACTION_SETTINGS_CLEAR_APP_CACHE); + SettingsEnums.ACTION_SETTINGS_CLEAR_APP_CACHE); mPm.deleteApplicationCacheFiles(mPackageName, mClearCacheObserver); } @@ -361,7 +361,7 @@ public class AppStorageSettings extends AppInfoWithHeader * button for a system package */ private void initiateClearUserData() { - mMetricsFeatureProvider.action(getContext(), MetricsEvent.ACTION_SETTINGS_CLEAR_APP_DATA); + mMetricsFeatureProvider.action(getContext(), SettingsEnums.ACTION_SETTINGS_CLEAR_APP_DATA); mButtonsPref.setButton1Enabled(false); // Invoke uninstall or clear user data based on sysPackage String packageName = mAppEntry.info.packageName; @@ -602,7 +602,7 @@ public class AppStorageSettings extends AppInfoWithHeader @Override public int getMetricsCategory() { - return MetricsEvent.APPLICATIONS_APP_STORAGE; + return SettingsEnums.APPLICATIONS_APP_STORAGE; } class ClearCacheObserver extends IPackageDataObserver.Stub { diff --git a/src/com/android/settings/applications/ConfirmConvertToFbe.java b/src/com/android/settings/applications/ConfirmConvertToFbe.java index 5570f97144f..35ddc6b3ca5 100644 --- a/src/com/android/settings/applications/ConfirmConvertToFbe.java +++ b/src/com/android/settings/applications/ConfirmConvertToFbe.java @@ -15,6 +15,7 @@ */ package com.android.settings.applications; +import android.app.settings.SettingsEnums; import android.content.Intent; import android.os.Bundle; import android.view.LayoutInflater; @@ -22,7 +23,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -50,6 +50,6 @@ public class ConfirmConvertToFbe extends SettingsPreferenceFragment { @Override public int getMetricsCategory() { - return MetricsEvent.CONVERT_FBE_CONFIRM; + return SettingsEnums.CONVERT_FBE_CONFIRM; } } diff --git a/src/com/android/settings/applications/ConvertToFbe.java b/src/com/android/settings/applications/ConvertToFbe.java index 85527d27225..2a6bdaf2c4b 100644 --- a/src/com/android/settings/applications/ConvertToFbe.java +++ b/src/com/android/settings/applications/ConvertToFbe.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import android.annotation.Nullable; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.Intent; import android.content.res.Resources; import android.os.Bundle; @@ -25,7 +26,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.SubSettingLauncher; @@ -90,6 +90,6 @@ public class ConvertToFbe extends InstrumentedFragment { @Override public int getMetricsCategory() { - return MetricsEvent.CONVERT_FBE; + return SettingsEnums.CONVERT_FBE; } } diff --git a/src/com/android/settings/applications/DefaultAppSettings.java b/src/com/android/settings/applications/DefaultAppSettings.java index d8fd9ebb725..353d867108f 100644 --- a/src/com/android/settings/applications/DefaultAppSettings.java +++ b/src/com/android/settings/applications/DefaultAppSettings.java @@ -16,12 +16,12 @@ package com.android.settings.applications; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.Context; import android.icu.text.ListFormatter; import android.provider.SearchIndexableResource; import android.text.TextUtils; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.assist.DefaultAssistPreferenceController; import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController; @@ -69,7 +69,7 @@ public class DefaultAppSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.APPLICATIONS_ADVANCED; + return SettingsEnums.APPLICATIONS_ADVANCED; } private static List buildPreferenceControllers(Context context) { diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java index 59de758b4a0..266c1951301 100644 --- a/src/com/android/settings/applications/ProcessStatsDetail.java +++ b/src/com/android/settings/applications/ProcessStatsDetail.java @@ -22,6 +22,7 @@ import android.app.Activity; import android.app.ActivityManager; import android.app.ActivityManager.RunningServiceInfo; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; import android.content.DialogInterface; @@ -47,7 +48,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.CancellablePreference; import com.android.settings.CancellablePreference.OnCancelListener; import com.android.settings.R; @@ -146,7 +146,7 @@ public class ProcessStatsDetail extends SettingsPreferenceFragment { @Override public int getMetricsCategory() { - return MetricsEvent.APPLICATIONS_PROCESS_STATS_DETAIL; + return SettingsEnums.APPLICATIONS_PROCESS_STATS_DETAIL; } @Override diff --git a/src/com/android/settings/applications/ProcessStatsSummary.java b/src/com/android/settings/applications/ProcessStatsSummary.java index c32bac74db3..e5760651b6f 100644 --- a/src/com/android/settings/applications/ProcessStatsSummary.java +++ b/src/com/android/settings/applications/ProcessStatsSummary.java @@ -16,6 +16,7 @@ package com.android.settings.applications; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.text.format.Formatter; @@ -24,7 +25,6 @@ import android.text.format.Formatter.BytesResult; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SummaryPreference; import com.android.settings.Utils; @@ -102,7 +102,7 @@ public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenc @Override public int getMetricsCategory() { - return MetricsEvent.PROCESS_STATS_SUMMARY; + return SettingsEnums.PROCESS_STATS_SUMMARY; } @Override diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java index 25f9c7eec5b..f49d638723c 100644 --- a/src/com/android/settings/applications/ProcessStatsUi.java +++ b/src/com/android/settings/applications/ProcessStatsUi.java @@ -16,6 +16,7 @@ package com.android.settings.applications; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.pm.PackageManager; import android.os.Bundle; @@ -29,7 +30,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import com.android.internal.app.procstats.ProcessStats; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.applications.ProcStatsData.MemInfo; @@ -93,7 +93,7 @@ public class ProcessStatsUi extends ProcessStatsBase { @Override public int getMetricsCategory() { - return MetricsEvent.APPLICATIONS_PROCESS_STATS_UI; + return SettingsEnums.APPLICATIONS_PROCESS_STATS_UI; } @Override diff --git a/src/com/android/settings/applications/RecentAppsPreferenceController.java b/src/com/android/settings/applications/RecentAppsPreferenceController.java index b6e8f4c6071..81eefb3df79 100644 --- a/src/com/android/settings/applications/RecentAppsPreferenceController.java +++ b/src/com/android/settings/applications/RecentAppsPreferenceController.java @@ -16,10 +16,8 @@ package com.android.settings.applications; -import static com.android.internal.logging.nano.MetricsProto.MetricsEvent - .SETTINGS_APP_NOTIF_CATEGORY; - import android.app.Application; +import android.app.settings.SettingsEnums; import android.app.usage.UsageStats; import android.app.usage.UsageStatsManager; import android.content.Context; @@ -251,7 +249,7 @@ public class RecentAppsPreferenceController extends AbstractPreferenceController pref.setOnPreferenceClickListener(preference -> { AppInfoBase.startAppInfoFragment(AppInfoDashboardFragment.class, R.string.application_info_label, pkgName, appEntry.info.uid, mHost, - 1001 /*RequestCode*/, SETTINGS_APP_NOTIF_CATEGORY); + 1001 /*RequestCode*/, SettingsEnums.SETTINGS_APP_NOTIF_CATEGORY); return true; }); if (!rebindPref) { diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java index 272945c7454..6165fb43b84 100644 --- a/src/com/android/settings/applications/RunningServiceDetails.java +++ b/src/com/android/settings/applications/RunningServiceDetails.java @@ -5,6 +5,7 @@ import android.app.ActivityManager; import android.app.ApplicationErrorReport; import android.app.Dialog; import android.app.PendingIntent; +import android.app.settings.SettingsEnums; import android.content.ActivityNotFoundException; import android.content.ComponentName; import android.content.Context; @@ -32,7 +33,6 @@ import android.widget.TextView; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.InstrumentedFragment; @@ -535,7 +535,7 @@ public class RunningServiceDetails extends InstrumentedFragment @Override public int getMetricsCategory() { - return MetricsEvent.RUNNING_SERVICE_DETAILS; + return SettingsEnums.RUNNING_SERVICE_DETAILS; } @Override @@ -608,7 +608,7 @@ public class RunningServiceDetails extends InstrumentedFragment @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_RUNNIGN_SERVICE; + return SettingsEnums.DIALOG_RUNNIGN_SERVICE; } } diff --git a/src/com/android/settings/applications/RunningServices.java b/src/com/android/settings/applications/RunningServices.java index bf484921022..4d13241126f 100644 --- a/src/com/android/settings/applications/RunningServices.java +++ b/src/com/android/settings/applications/RunningServices.java @@ -15,6 +15,7 @@ */ package com.android.settings.applications; +import android.app.settings.SettingsEnums; import android.os.Bundle; import android.view.LayoutInflater; import android.view.Menu; @@ -23,7 +24,6 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.widget.LoadingViewController; @@ -110,7 +110,7 @@ public class RunningServices extends SettingsPreferenceFragment { @Override public int getMetricsCategory() { - return MetricsEvent.RUNNING_SERVICES; + return SettingsEnums.RUNNING_SERVICES; } private final Runnable mRunningProcessesAvail = new Runnable() { diff --git a/src/com/android/settings/applications/UsageAccessDetails.java b/src/com/android/settings/applications/UsageAccessDetails.java index 0a01896f879..58dff7c2e02 100644 --- a/src/com/android/settings/applications/UsageAccessDetails.java +++ b/src/com/android/settings/applications/UsageAccessDetails.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import android.app.AppOpsManager; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -32,7 +33,6 @@ import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppStateUsageBridge.UsageState; import com.android.settings.overlay.FeatureFactory; @@ -112,8 +112,8 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc @VisibleForTesting void logSpecialPermissionChange(boolean newState, String packageName) { - int logCategory = newState ? MetricsEvent.APP_SPECIAL_PERMISSION_USAGE_VIEW_ALLOW - : MetricsEvent.APP_SPECIAL_PERMISSION_USAGE_VIEW_DENY; + int logCategory = newState ? SettingsEnums.APP_SPECIAL_PERMISSION_USAGE_VIEW_ALLOW + : SettingsEnums.APP_SPECIAL_PERMISSION_USAGE_VIEW_DENY; final MetricsFeatureProvider metricsFeatureProvider = FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider(); metricsFeatureProvider.action( @@ -163,7 +163,7 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc @Override public int getMetricsCategory() { - return MetricsEvent.APPLICATIONS_USAGE_ACCESS_DETAIL; + return SettingsEnums.APPLICATIONS_USAGE_ACCESS_DETAIL; } } diff --git a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java index 2e528a71e6f..c6618908f52 100644 --- a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.applications.appinfo; import android.app.Activity; import android.app.ActivityManager; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -44,7 +45,6 @@ import androidx.annotation.VisibleForTesting; import androidx.fragment.app.Fragment; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.Utils; @@ -218,7 +218,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp uninstallDaIntent.putExtra(DeviceAdminAdd.EXTRA_DEVICE_ADMIN_PACKAGE_NAME, packageName); mMetricsFeatureProvider.action(mActivity, - MetricsProto.MetricsEvent.ACTION_SETTINGS_UNINSTALL_DEVICE_ADMIN); + SettingsEnums.ACTION_SETTINGS_UNINSTALL_DEVICE_ADMIN); mFragment.startActivityForResult(uninstallDaIntent, mRequestRemoveDeviceAdmin); return; } @@ -244,8 +244,8 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp mMetricsFeatureProvider.action( mActivity, mAppEntry.info.enabled - ? MetricsProto.MetricsEvent.ACTION_SETTINGS_DISABLE_APP - : MetricsProto.MetricsEvent.ACTION_SETTINGS_ENABLE_APP); + ? SettingsEnums.ACTION_SETTINGS_DISABLE_APP + : SettingsEnums.ACTION_SETTINGS_ENABLE_APP); AsyncTask.execute(new DisableChangerRunnable(mPm, mAppEntry.info.packageName, PackageManager.COMPONENT_ENABLED_STATE_DEFAULT)); } @@ -288,13 +288,13 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp switch (id) { case ButtonActionDialogFragment.DialogType.DISABLE: mMetricsFeatureProvider.action(mActivity, - MetricsProto.MetricsEvent.ACTION_SETTINGS_DISABLE_APP); + SettingsEnums.ACTION_SETTINGS_DISABLE_APP); AsyncTask.execute(new DisableChangerRunnable(mPm, mAppEntry.info.packageName, PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER)); break; case ButtonActionDialogFragment.DialogType.SPECIAL_DISABLE: mMetricsFeatureProvider.action(mActivity, - MetricsProto.MetricsEvent.ACTION_SETTINGS_DISABLE_APP); + SettingsEnums.ACTION_SETTINGS_DISABLE_APP); uninstallPkg(mAppEntry.info.packageName, false, true); break; case ButtonActionDialogFragment.DialogType.FORCE_STOP: @@ -524,7 +524,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp uninstallIntent.putExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, allUsers); mMetricsFeatureProvider.action( - mActivity, MetricsProto.MetricsEvent.ACTION_SETTINGS_UNINSTALL_APP); + mActivity, SettingsEnums.ACTION_SETTINGS_UNINSTALL_APP); mFragment.startActivityForResult(uninstallIntent, mRequestUninstall); mDisableAfterUninstall = andDisable; } @@ -533,7 +533,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp void forceStopPackage(String pkgName) { mMetricsFeatureProvider.action( mMetricsFeatureProvider.getAttribution(mActivity), - MetricsProto.MetricsEvent.ACTION_APP_FORCE_STOP, + SettingsEnums.ACTION_APP_FORCE_STOP, mFragment.getMetricsCategory(), pkgName, 0); diff --git a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java index 80cc6ae0dd1..4987286ed36 100755 --- a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java +++ b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java @@ -20,6 +20,7 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import android.app.Activity; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -41,13 +42,11 @@ import android.view.MenuItem; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.manageapplications.ManageApplications; -import com.android.settings.applications.specialaccess.pictureinpicture - .PictureInPictureDetailPreferenceController; +import com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetailPreferenceController; import com.android.settings.core.SubSettingLauncher; import com.android.settings.dashboard.DashboardFragment; import com.android.settingslib.RestrictedLockUtilsInternal; @@ -209,7 +208,7 @@ public class AppInfoDashboardFragment extends DashboardFragment @Override public int getMetricsCategory() { - return MetricsEvent.APPLICATIONS_INSTALLED_APP_DETAILS; + return SettingsEnums.APPLICATIONS_INSTALLED_APP_DETAILS; } @Override @@ -459,7 +458,7 @@ public class AppInfoDashboardFragment extends DashboardFragment final Intent uninstallIntent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageURI); uninstallIntent.putExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, allUsers); mMetricsFeatureProvider.action( - getContext(), MetricsEvent.ACTION_SETTINGS_UNINSTALL_APP); + getContext(), SettingsEnums.ACTION_SETTINGS_UNINSTALL_APP); startActivityForResult(uninstallIntent, REQUEST_UNINSTALL); } diff --git a/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java b/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java index c08ae75fe3a..cacbffb946f 100644 --- a/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java @@ -16,8 +16,6 @@ package com.android.settings.applications.appinfo; -import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_OPEN_APP_SETTING; - import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; @@ -63,7 +61,7 @@ public class AppSettingPreferenceController extends AppInfoPreferenceControllerB } FeatureFactory.getFactory(mContext).getMetricsFeatureProvider() .action(SettingsEnums.PAGE_UNKNOWN, - ACTION_OPEN_APP_SETTING, + SettingsEnums.ACTION_OPEN_APP_SETTING, mParent.getMetricsCategory(), null, 0); mContext.startActivity(intent); diff --git a/src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java b/src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java index a0a8fb6fdaf..80ce8020035 100644 --- a/src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java +++ b/src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java @@ -16,6 +16,7 @@ package com.android.settings.applications.appinfo; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; @@ -24,7 +25,6 @@ import androidx.annotation.IntDef; import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -74,7 +74,7 @@ public class ButtonActionDialogFragment extends InstrumentedDialogFragment imple public int getMetricsCategory() { //TODO(35810915): update the metrics label because for now this fragment will be shown // in two screens - return MetricsProto.MetricsEvent.DIALOG_APP_INFO_ACTION; + return SettingsEnums.DIALOG_APP_INFO_ACTION; } @Override diff --git a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java index e25075f3453..804fdbe28d2 100644 --- a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java +++ b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java @@ -15,6 +15,7 @@ package com.android.settings.applications.appinfo; import android.app.role.RoleManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -23,7 +24,6 @@ import android.text.TextUtils; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto; import com.android.internal.util.CollectionUtils; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -90,7 +90,7 @@ public abstract class DefaultAppShortcutPreferenceControllerBase extends BasePre .setDestination(DefaultAppSettings.class.getName()) .setArguments(bundle) .setTitleRes(R.string.configure_apps) - .setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN) + .setSourceMetricsCategory(SettingsEnums.PAGE_UNKNOWN) .launch(); } return true; diff --git a/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java b/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java index f0d1068fd58..9cf57bd1f65 100644 --- a/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java +++ b/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java @@ -18,6 +18,7 @@ package com.android.settings.applications.appinfo; import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; import android.app.AppOpsManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -34,7 +35,6 @@ import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; import com.android.settings.applications.AppStateAppOpsBridge.PermissionState; @@ -128,8 +128,8 @@ public class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenc @VisibleForTesting void logSpecialPermissionChange(boolean newState, String packageName) { - int logCategory = newState ? MetricsEvent.APP_SPECIAL_PERMISSION_APPDRAW_ALLOW - : MetricsEvent.APP_SPECIAL_PERMISSION_APPDRAW_DENY; + int logCategory = newState ? SettingsEnums.APP_SPECIAL_PERMISSION_APPDRAW_ALLOW + : SettingsEnums.APP_SPECIAL_PERMISSION_APPDRAW_DENY; final MetricsFeatureProvider metricsFeatureProvider = FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider(); metricsFeatureProvider.action( @@ -163,7 +163,7 @@ public class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenc @Override public int getMetricsCategory() { - return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS; + return SettingsEnums.SYSTEM_ALERT_WINDOW_APPS; } public static CharSequence getSummary(Context context, AppEntry entry) { diff --git a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java index 38e70d1ee17..b7232744365 100644 --- a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java +++ b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java @@ -19,6 +19,7 @@ import static android.app.Activity.RESULT_CANCELED; import static android.app.Activity.RESULT_OK; import android.app.AppOpsManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.os.UserHandle; @@ -28,7 +29,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Settings; import com.android.settings.applications.AppInfoWithHeader; @@ -143,6 +143,6 @@ public class ExternalSourcesDetails extends AppInfoWithHeader @Override public int getMetricsCategory() { - return MetricsEvent.MANAGE_EXTERNAL_SOURCES; + return SettingsEnums.MANAGE_EXTERNAL_SOURCES; } } diff --git a/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java b/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java index 808d018136f..6376d521be5 100644 --- a/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java +++ b/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java @@ -16,6 +16,7 @@ package com.android.settings.applications.appinfo; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.content.pm.PackageManager; @@ -24,7 +25,6 @@ import android.os.UserHandle; import androidx.appcompat.app.AlertDialog; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.overlay.FeatureFactory; @@ -49,7 +49,7 @@ public class InstantAppButtonDialogFragment extends InstrumentedDialogFragment i @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_APP_INFO_ACTION; + return SettingsEnums.DIALOG_APP_INFO_ACTION; } @Override @@ -64,7 +64,7 @@ public class InstantAppButtonDialogFragment extends InstrumentedDialogFragment i final Context context = getContext(); final PackageManager packageManager = context.getPackageManager(); FeatureFactory.getFactory(context).getMetricsFeatureProvider() - .action(context, MetricsEvent.ACTION_SETTINGS_CLEAR_INSTANT_APP, mPackageName); + .action(context, SettingsEnums.ACTION_SETTINGS_CLEAR_INSTANT_APP, mPackageName); packageManager.deletePackageAsUser(mPackageName, null, 0, UserHandle.myUserId()); } diff --git a/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java b/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java index e126b5eb7a7..f8c7ac5ad5b 100644 --- a/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java +++ b/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java @@ -16,6 +16,7 @@ package com.android.settings.applications.appinfo; import android.app.AppOpsManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -29,7 +30,6 @@ import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; import com.android.settings.applications.AppStateAppOpsBridge.PermissionState; @@ -101,8 +101,8 @@ public class WriteSettingsDetails extends AppInfoWithHeader implements OnPrefere } void logSpecialPermissionChange(boolean newState, String packageName) { - int logCategory = newState ? MetricsEvent.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_ALLOW - : MetricsEvent.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_DENY; + int logCategory = newState ? SettingsEnums.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_ALLOW + : SettingsEnums.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_DENY; FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider().action(getContext(), logCategory, packageName); } @@ -139,7 +139,7 @@ public class WriteSettingsDetails extends AppInfoWithHeader implements OnPrefere @Override public int getMetricsCategory() { - return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS; + return SettingsEnums.SYSTEM_ALERT_WINDOW_APPS; } public static CharSequence getSummary(Context context, AppEntry entry) { diff --git a/src/com/android/settings/applications/appops/BackgroundCheckSummary.java b/src/com/android/settings/applications/appops/BackgroundCheckSummary.java index 601a566a39f..58f962ab716 100644 --- a/src/com/android/settings/applications/appops/BackgroundCheckSummary.java +++ b/src/com/android/settings/applications/appops/BackgroundCheckSummary.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appops; import android.annotation.Nullable; +import android.app.settings.SettingsEnums; import android.os.Bundle; import android.preference.PreferenceFrameLayout; import android.view.LayoutInflater; @@ -25,7 +26,6 @@ import android.view.ViewGroup; import androidx.fragment.app.FragmentTransaction; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.InstrumentedPreferenceFragment; @@ -35,7 +35,7 @@ public class BackgroundCheckSummary extends InstrumentedPreferenceFragment { @Override public int getMetricsCategory() { - return MetricsEvent.BACKGROUND_CHECK_SUMMARY; + return SettingsEnums.BACKGROUND_CHECK_SUMMARY; } @Override diff --git a/src/com/android/settings/applications/assist/DefaultAssistPicker.java b/src/com/android/settings/applications/assist/DefaultAssistPicker.java index d8670708a57..6391aa8b217 100644 --- a/src/com/android/settings/applications/assist/DefaultAssistPicker.java +++ b/src/com/android/settings/applications/assist/DefaultAssistPicker.java @@ -17,6 +17,7 @@ package com.android.settings.applications.assist; import android.app.ActivityManager; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -32,7 +33,6 @@ import android.util.Log; import androidx.annotation.VisibleForTesting; import com.android.internal.app.AssistUtils; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.defaultapps.DefaultAppPickerFragment; import com.android.settingslib.applications.DefaultAppInfo; @@ -57,7 +57,7 @@ public class DefaultAssistPicker extends DefaultAppPickerFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DEFAULT_ASSIST_PICKER; + return SettingsEnums.DEFAULT_ASSIST_PICKER; } @Override diff --git a/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java b/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java index 57672b96a31..e5953dbe723 100644 --- a/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java +++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java @@ -16,6 +16,7 @@ package com.android.settings.applications.assist; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -24,7 +25,6 @@ import android.provider.Settings; import android.text.TextUtils; import com.android.internal.app.AssistUtils; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.defaultapps.DefaultAppPickerFragment; import com.android.settingslib.applications.DefaultAppInfo; @@ -40,7 +40,7 @@ public class DefaultVoiceInputPicker extends DefaultAppPickerFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DEFAULT_VOICE_INPUT_PICKER; + return SettingsEnums.DEFAULT_VOICE_INPUT_PICKER; } @Override diff --git a/src/com/android/settings/applications/assist/ManageAssist.java b/src/com/android/settings/applications/assist/ManageAssist.java index 8eb6a7fbcf7..952a3ad8960 100644 --- a/src/com/android/settings/applications/assist/ManageAssist.java +++ b/src/com/android/settings/applications/assist/ManageAssist.java @@ -16,10 +16,10 @@ package com.android.settings.applications.assist; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.gestures.AssistGestureSettingsPreferenceController; @@ -59,7 +59,7 @@ public class ManageAssist extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.APPLICATIONS_MANAGE_ASSIST; + return SettingsEnums.APPLICATIONS_MANAGE_ASSIST; } @Override diff --git a/src/com/android/settings/applications/defaultapps/AutofillPicker.java b/src/com/android/settings/applications/defaultapps/AutofillPicker.java index 6691d2fd84a..fb9d6314aca 100644 --- a/src/com/android/settings/applications/defaultapps/AutofillPicker.java +++ b/src/com/android/settings/applications/defaultapps/AutofillPicker.java @@ -16,10 +16,10 @@ package com.android.settings.applications.defaultapps; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -36,7 +36,7 @@ public class AutofillPicker extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DEFAULT_AUTOFILL_PICKER; + return SettingsEnums.DEFAULT_AUTOFILL_PICKER; } @Override diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java index 14bf1ef82d4..5d41ba71332 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java +++ b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java @@ -29,7 +29,6 @@ import androidx.fragment.app.DialogFragment; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.fuelgauge.BatteryUtils; @@ -71,7 +70,7 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment protected void onRadioButtonConfirmed(String selectedKey) { mMetricsFeatureProvider.action( mMetricsFeatureProvider.getAttribution(getActivity()), - MetricsEvent.ACTION_SETTINGS_UPDATE_DEFAULT_APP, + SettingsEnums.ACTION_SETTINGS_UPDATE_DEFAULT_APP, getMetricsCategory(), selectedKey, 0 /* value */); @@ -113,7 +112,7 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment @Override public int getMetricsCategory() { - return MetricsEvent.DEFAULT_APP_PICKER_CONFIRMATION_DIALOG; + return SettingsEnums.DEFAULT_APP_PICKER_CONFIRMATION_DIALOG; } /** diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java index 459a5b778df..49659ad37bd 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java +++ b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java @@ -18,6 +18,7 @@ package com.android.settings.applications.defaultapps; import android.Manifest; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; import android.content.DialogInterface; @@ -38,7 +39,6 @@ import android.util.Log; import androidx.preference.Preference; import com.android.internal.content.PackageMonitor; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.utils.ThreadUtils; @@ -114,7 +114,7 @@ public class DefaultAutofillPicker extends DefaultAppPickerFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DEFAULT_AUTOFILL_PICKER; + return SettingsEnums.DEFAULT_AUTOFILL_PICKER; } @Override diff --git a/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java b/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java index cfaac3a4441..40ea25ed663 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java +++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java @@ -16,11 +16,11 @@ package com.android.settings.applications.defaultapps; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settingslib.applications.DefaultAppInfo; @@ -39,7 +39,7 @@ public class DefaultBrowserPicker extends DefaultAppPickerFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DEFAULT_BROWSER_PICKER; + return SettingsEnums.DEFAULT_BROWSER_PICKER; } @Override diff --git a/src/com/android/settings/applications/defaultapps/DefaultEmergencyPicker.java b/src/com/android/settings/applications/defaultapps/DefaultEmergencyPicker.java index 76e93ccd6bc..5a1effdd01e 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultEmergencyPicker.java +++ b/src/com/android/settings/applications/defaultapps/DefaultEmergencyPicker.java @@ -16,6 +16,7 @@ package com.android.settings.applications.defaultapps; +import android.app.settings.SettingsEnums; import android.content.ContentResolver; import android.content.Context; import android.content.pm.ApplicationInfo; @@ -25,7 +26,6 @@ import android.content.pm.ResolveInfo; import android.provider.Settings; import android.text.TextUtils; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.applications.DefaultAppInfo; @@ -38,7 +38,7 @@ public class DefaultEmergencyPicker extends DefaultAppPickerFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DEFAULT_EMERGENCY_APP_PICKER; + return SettingsEnums.DEFAULT_EMERGENCY_APP_PICKER; } @Override diff --git a/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java b/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java index 73cc9158c71..304b307b076 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java +++ b/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java @@ -16,6 +16,7 @@ package com.android.settings.applications.defaultapps; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -28,7 +29,6 @@ import android.content.pm.UserInfo; import android.os.Build; import android.text.TextUtils; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settingslib.applications.DefaultAppInfo; @@ -52,7 +52,7 @@ public class DefaultHomePicker extends DefaultAppPickerFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DEFAULT_HOME_PICKER; + return SettingsEnums.DEFAULT_HOME_PICKER; } @Override diff --git a/src/com/android/settings/applications/defaultapps/DefaultPhonePicker.java b/src/com/android/settings/applications/defaultapps/DefaultPhonePicker.java index 72f1cc5d509..8b16be1f061 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultPhonePicker.java +++ b/src/com/android/settings/applications/defaultapps/DefaultPhonePicker.java @@ -16,13 +16,13 @@ package com.android.settings.applications.defaultapps; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.pm.PackageManager; import android.telecom.DefaultDialerManager; import android.telecom.TelecomManager; import android.text.TextUtils; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settingslib.applications.DefaultAppInfo; @@ -35,7 +35,7 @@ public class DefaultPhonePicker extends DefaultAppPickerFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DEFAULT_PHONE_PICKER; + return SettingsEnums.DEFAULT_PHONE_PICKER; } @Override diff --git a/src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java b/src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java index 6d1e21df8d6..4c6b6e87f26 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java +++ b/src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java @@ -16,12 +16,12 @@ package com.android.settings.applications.defaultapps; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; import android.text.TextUtils; -import com.android.internal.logging.nano.MetricsProto; import com.android.internal.telephony.SmsApplication; import com.android.settings.R; import com.android.settings.Utils; @@ -38,7 +38,7 @@ public class DefaultSmsPicker extends DefaultAppPickerFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DEFAULT_SMS_PICKER; + return SettingsEnums.DEFAULT_SMS_PICKER; } @Override diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java index 5669b4c7c36..126cf6d047f 100644 --- a/src/com/android/settings/applications/manageapplications/ManageApplications.java +++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java @@ -18,32 +18,22 @@ package com.android.settings.applications.manageapplications; import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE; -import static com.android.settings.applications.manageapplications.AppFilterRegistry - .FILTER_APPS_ALL; -import static com.android.settings.applications.manageapplications.AppFilterRegistry - .FILTER_APPS_BLOCKED; -import static com.android.settings.applications.manageapplications.AppFilterRegistry - .FILTER_APPS_DISABLED; -import static com.android.settings.applications.manageapplications.AppFilterRegistry - .FILTER_APPS_ENABLED; -import static com.android.settings.applications.manageapplications.AppFilterRegistry - .FILTER_APPS_FREQUENT; -import static com.android.settings.applications.manageapplications.AppFilterRegistry - .FILTER_APPS_INSTANT; -import static com.android.settings.applications.manageapplications.AppFilterRegistry - .FILTER_APPS_PERSONAL; -import static com.android.settings.applications.manageapplications.AppFilterRegistry - .FILTER_APPS_POWER_WHITELIST; -import static com.android.settings.applications.manageapplications.AppFilterRegistry - .FILTER_APPS_POWER_WHITELIST_ALL; -import static com.android.settings.applications.manageapplications.AppFilterRegistry - .FILTER_APPS_RECENT; -import static com.android.settings.applications.manageapplications.AppFilterRegistry - .FILTER_APPS_WORK; +import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ALL; +import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_BLOCKED; +import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_DISABLED; +import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ENABLED; +import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_FREQUENT; +import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_INSTANT; +import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_PERSONAL; +import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_WHITELIST; +import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_WHITELIST_ALL; +import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_RECENT; +import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WORK; import android.annotation.Nullable; import android.annotation.StringRes; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.app.usage.IUsageStatsManager; import android.content.Context; import android.content.Intent; @@ -78,7 +68,6 @@ import androidx.annotation.WorkerThread; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Settings; import com.android.settings.Settings.GamesStorageActivity; @@ -453,34 +442,34 @@ public class ManageApplications extends InstrumentedFragment public int getMetricsCategory() { switch (mListType) { case LIST_TYPE_MAIN: - return MetricsEvent.MANAGE_APPLICATIONS; + return SettingsEnums.MANAGE_APPLICATIONS; case LIST_TYPE_NOTIFICATION: - return MetricsEvent.MANAGE_APPLICATIONS_NOTIFICATIONS; + return SettingsEnums.MANAGE_APPLICATIONS_NOTIFICATIONS; case LIST_TYPE_STORAGE: if (mStorageType == STORAGE_TYPE_MUSIC) { - return MetricsEvent.APPLICATIONS_STORAGE_MUSIC; + return SettingsEnums.APPLICATIONS_STORAGE_MUSIC; } - return MetricsEvent.APPLICATIONS_STORAGE_APPS; + return SettingsEnums.APPLICATIONS_STORAGE_APPS; case LIST_TYPE_GAMES: - return MetricsEvent.APPLICATIONS_STORAGE_GAMES; + return SettingsEnums.APPLICATIONS_STORAGE_GAMES; case LIST_TYPE_MOVIES: - return MetricsEvent.APPLICATIONS_STORAGE_MOVIES; + return SettingsEnums.APPLICATIONS_STORAGE_MOVIES; case LIST_TYPE_PHOTOGRAPHY: - return MetricsEvent.APPLICATIONS_STORAGE_PHOTOS; + return SettingsEnums.APPLICATIONS_STORAGE_PHOTOS; case LIST_TYPE_USAGE_ACCESS: - return MetricsEvent.USAGE_ACCESS; + return SettingsEnums.USAGE_ACCESS; case LIST_TYPE_HIGH_POWER: - return MetricsEvent.APPLICATIONS_HIGH_POWER_APPS; + return SettingsEnums.APPLICATIONS_HIGH_POWER_APPS; case LIST_TYPE_OVERLAY: - return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS; + return SettingsEnums.SYSTEM_ALERT_WINDOW_APPS; case LIST_TYPE_WRITE_SETTINGS: - return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS; + return SettingsEnums.SYSTEM_ALERT_WINDOW_APPS; case LIST_TYPE_MANAGE_SOURCES: - return MetricsEvent.MANAGE_EXTERNAL_SOURCES; + return SettingsEnums.MANAGE_EXTERNAL_SOURCES; case LIST_TYPE_WIFI_ACCESS: - return MetricsEvent.CONFIGURE_WIFI; + return SettingsEnums.CONFIGURE_WIFI; default: - return MetricsEvent.VIEW_UNKNOWN; + return SettingsEnums.PAGE_UNKNOWN; } } diff --git a/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java b/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java index 16f954a357f..010bc94c897 100644 --- a/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java +++ b/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java @@ -18,10 +18,10 @@ package com.android.settings.applications.managedomainurls; import static com.android.settingslib.search.SearchIndexable.MOBILE; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -58,7 +58,7 @@ public class ManageDomainUrls extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.MANAGE_DOMAIN_URLS; + return SettingsEnums.MANAGE_DOMAIN_URLS; } public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = diff --git a/src/com/android/settings/applications/specialaccess/SpecialAccessSettings.java b/src/com/android/settings/applications/specialaccess/SpecialAccessSettings.java index 80cadcc4396..4d9a42786a1 100644 --- a/src/com/android/settings/applications/specialaccess/SpecialAccessSettings.java +++ b/src/com/android/settings/applications/specialaccess/SpecialAccessSettings.java @@ -16,10 +16,10 @@ package com.android.settings.applications.specialaccess; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -46,7 +46,7 @@ public class SpecialAccessSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.SPECIAL_ACCESS; + return SettingsEnums.SPECIAL_ACCESS; } public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java index a260f678db5..7e0ca242b36 100644 --- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java +++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java @@ -60,7 +60,6 @@ import android.widget.TextView; import androidx.appcompat.app.AlertDialog; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.EventLogTags; import com.android.settings.R; import com.android.settings.fuelgauge.BatteryUtils; @@ -488,8 +487,8 @@ public class DeviceAdminAdd extends Activity { } void logSpecialPermissionChange(boolean allow, String packageName) { - int logCategory = allow ? MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_ADMIN_ALLOW : - MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_ADMIN_DENY; + int logCategory = allow ? SettingsEnums.APP_SPECIAL_PERMISSION_ADMIN_ALLOW : + SettingsEnums.APP_SPECIAL_PERMISSION_ADMIN_DENY; FeatureFactory.getFactory(this).getMetricsFeatureProvider().action( SettingsEnums.PAGE_UNKNOWN, logCategory, diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java index 4cd4c049f4f..7cbd8c72aaa 100644 --- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java +++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java @@ -16,10 +16,10 @@ package com.android.settings.applications.specialaccess.deviceadmin; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -34,7 +34,7 @@ public class DeviceAdminSettings extends DashboardFragment { static final String TAG = "DeviceAdminSettings"; public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DEVICE_ADMIN_SETTINGS; + return SettingsEnums.DEVICE_ADMIN_SETTINGS; } @Override diff --git a/src/com/android/settings/applications/specialaccess/financialapps/FinancialAppsController.java b/src/com/android/settings/applications/specialaccess/financialapps/FinancialAppsController.java index 492e4fd2566..c0517df1468 100644 --- a/src/com/android/settings/applications/specialaccess/financialapps/FinancialAppsController.java +++ b/src/com/android/settings/applications/specialaccess/financialapps/FinancialAppsController.java @@ -15,8 +15,8 @@ */ package com.android.settings.applications.specialaccess.financialapps; -import static android.Manifest.permission.SMS_FINANCIAL_TRANSACTIONS; import static android.Manifest.permission.READ_SMS; +import static android.Manifest.permission.SMS_FINANCIAL_TRANSACTIONS; import android.app.AppOpsManager; import android.content.Context; @@ -24,20 +24,18 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.os.Build; -import android.os.Bundle; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.ArrayUtils; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.SwitchPreference; - import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java index c36c97ad34e..3dd428b2e18 100644 --- a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java +++ b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java @@ -20,6 +20,7 @@ import static android.app.AppOpsManager.MODE_ERRORED; import static android.app.AppOpsManager.OP_PICTURE_IN_PICTURE; import android.app.AppOpsManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; @@ -29,7 +30,6 @@ import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; import com.android.settings.overlay.FeatureFactory; @@ -84,7 +84,7 @@ public class PictureInPictureDetails extends AppInfoWithHeader @Override public int getMetricsCategory() { - return MetricsEvent.SETTINGS_MANAGE_PICTURE_IN_PICTURE; + return SettingsEnums.SETTINGS_MANAGE_PICTURE_IN_PICTURE; } /** @@ -121,8 +121,8 @@ public class PictureInPictureDetails extends AppInfoWithHeader @VisibleForTesting void logSpecialPermissionChange(boolean newState, String packageName) { int logCategory = newState - ? MetricsEvent.APP_PICTURE_IN_PICTURE_ALLOW - : MetricsEvent.APP_PICTURE_IN_PICTURE_DENY; + ? SettingsEnums.APP_PICTURE_IN_PICTURE_ALLOW + : SettingsEnums.APP_PICTURE_IN_PICTURE_DENY; final MetricsFeatureProvider metricsFeatureProvider = FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider(); metricsFeatureProvider.action( diff --git a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java index d2cb2a7f1ac..fdbe1d8cd75 100644 --- a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java +++ b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java @@ -18,6 +18,7 @@ package com.android.settings.applications.specialaccess.pictureinpicture; import static android.content.pm.PackageManager.GET_ACTIVITIES; import android.annotation.Nullable; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; @@ -37,7 +38,6 @@ import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppInfoBase; import com.android.settings.search.BaseSearchIndexProvider; @@ -192,7 +192,7 @@ public class PictureInPictureSettings extends EmptyTextSettings { @Override public int getMetricsCategory() { - return MetricsEvent.SETTINGS_MANAGE_PICTURE_IN_PICTURE; + return SettingsEnums.SETTINGS_MANAGE_PICTURE_IN_PICTURE; } /** diff --git a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java index 2ccf64ff5e1..a40ddc9485a 100644 --- a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java +++ b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java @@ -18,6 +18,7 @@ package com.android.settings.applications.specialaccess.premiumsms; import android.annotation.Nullable; import android.app.Application; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; @@ -30,7 +31,6 @@ import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceViewHolder; -import com.android.internal.logging.nano.MetricsProto; import com.android.internal.telephony.SmsUsageMonitor; import com.android.settings.R; import com.android.settings.applications.AppStateBaseBridge.Callback; @@ -99,7 +99,7 @@ public class PremiumSmsAccess extends EmptyTextSettings @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.PREMIUM_SMS_ACCESS; + return SettingsEnums.PREMIUM_SMS_ACCESS; } @Override @@ -116,13 +116,13 @@ public class PremiumSmsAccess extends EmptyTextSettings int category = SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN; switch (smsState) { case SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ASK_USER: - category = MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_PREMIUM_SMS_ASK; + category = SettingsEnums.APP_SPECIAL_PERMISSION_PREMIUM_SMS_ASK; break; case SmsUsageMonitor.PREMIUM_SMS_PERMISSION_NEVER_ALLOW: - category = MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_PREMIUM_SMS_DENY; + category = SettingsEnums.APP_SPECIAL_PERMISSION_PREMIUM_SMS_DENY; break; case SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ALWAYS_ALLOW: - category = MetricsProto.MetricsEvent. + category = SettingsEnums. APP_SPECIAL_PERMISSION_PREMIUM_SMS_ALWAYS_ALLOW; break; } diff --git a/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java b/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java index b0c745dae6a..fec57c25ac7 100644 --- a/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java +++ b/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java @@ -15,6 +15,7 @@ */ package com.android.settings.applications.specialaccess.vrlistener; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; import android.provider.SearchIndexableResource; @@ -23,7 +24,6 @@ import android.service.vr.VrListenerService; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; @@ -56,7 +56,7 @@ public class VrListenerSettings extends ManagedServiceSettings { @Override public int getMetricsCategory() { - return MetricsEvent.VR_MANAGE_LISTENERS; + return SettingsEnums.VR_MANAGE_LISTENERS; } @Override @@ -72,8 +72,8 @@ public class VrListenerSettings extends ManagedServiceSettings { @VisibleForTesting void logSpecialPermissionChange(boolean enable, String packageName) { - int logCategory = enable ? MetricsEvent.APP_SPECIAL_PERMISSION_VRHELPER_ALLOW - : MetricsEvent.APP_SPECIAL_PERMISSION_VRHELPER_DENY; + int logCategory = enable ? SettingsEnums.APP_SPECIAL_PERMISSION_VRHELPER_ALLOW + : SettingsEnums.APP_SPECIAL_PERMISSION_VRHELPER_DENY; final MetricsFeatureProvider metricsFeatureProvider = FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider(); metricsFeatureProvider.action( diff --git a/src/com/android/settings/backup/BackupSettingsFragment.java b/src/com/android/settings/backup/BackupSettingsFragment.java index 4124fcec472..57c8d002f41 100644 --- a/src/com/android/settings/backup/BackupSettingsFragment.java +++ b/src/com/android/settings/backup/BackupSettingsFragment.java @@ -16,10 +16,10 @@ package com.android.settings.backup; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -76,6 +76,6 @@ public class BackupSettingsFragment extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.BACKUP_SETTINGS; + return SettingsEnums.BACKUP_SETTINGS; } } diff --git a/src/com/android/settings/backup/PrivacySettings.java b/src/com/android/settings/backup/PrivacySettings.java index 684956e5a6e..e6d2bd443c4 100644 --- a/src/com/android/settings/backup/PrivacySettings.java +++ b/src/com/android/settings/backup/PrivacySettings.java @@ -16,10 +16,10 @@ package com.android.settings.backup; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -34,7 +34,7 @@ public class PrivacySettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.PRIVACY; + return SettingsEnums.PRIVACY; } @Override diff --git a/src/com/android/settings/backup/ToggleBackupSettingFragment.java b/src/com/android/settings/backup/ToggleBackupSettingFragment.java index 70ab68ab4d4..8b3a54a65cc 100644 --- a/src/com/android/settings/backup/ToggleBackupSettingFragment.java +++ b/src/com/android/settings/backup/ToggleBackupSettingFragment.java @@ -2,6 +2,7 @@ package com.android.settings.backup; import android.app.Dialog; import android.app.backup.IBackupManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; @@ -17,7 +18,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceViewHolder; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; @@ -194,7 +194,7 @@ public class ToggleBackupSettingFragment extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.PRIVACY; + return SettingsEnums.PRIVACY; } /** diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java b/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java index 2323afc072c..8ec64e5340d 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java @@ -16,6 +16,7 @@ package com.android.settings.biometrics.face; +import android.app.settings.SettingsEnums; import android.content.Intent; import android.hardware.face.FaceManager; import android.os.Bundle; @@ -26,18 +27,17 @@ import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; import android.widget.TextView; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.biometrics.BiometricEnrollBase; import com.android.settings.biometrics.BiometricEnrollSidecar; import com.android.settings.biometrics.BiometricErrorDialog; import com.android.settings.biometrics.BiometricsEnrollEnrolling; -import java.util.ArrayList; - import com.google.android.setupcompat.item.FooterButton; import com.google.android.setupcompat.template.ButtonFooterMixin; +import java.util.ArrayList; + public class FaceEnrollEnrolling extends BiometricsEnrollEnrolling { private static final String TAG = "FaceEnrollEnrolling"; @@ -68,7 +68,7 @@ public class FaceEnrollEnrolling extends BiometricsEnrollEnrolling { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_FACE_ERROR; + return SettingsEnums.DIALOG_FACE_ERROR; } @Override @@ -146,7 +146,7 @@ public class FaceEnrollEnrolling extends BiometricsEnrollEnrolling { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.FACE_ENROLL_ENROLLING; + return SettingsEnums.FACE_ENROLL_ENROLLING; } @Override diff --git a/src/com/android/settings/biometrics/face/FaceEnrollFinish.java b/src/com/android/settings/biometrics/face/FaceEnrollFinish.java index c347d0f0b1e..4db9a4ef2cc 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollFinish.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollFinish.java @@ -16,10 +16,10 @@ package com.android.settings.biometrics.face; +import android.app.settings.SettingsEnums; import android.os.Bundle; import android.view.View; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.biometrics.BiometricEnrollBase; @@ -50,7 +50,7 @@ public class FaceEnrollFinish extends BiometricEnrollBase { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.FACE_ENROLL_FINISHED; + return SettingsEnums.FACE_ENROLL_FINISHED; } @Override diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java index ba5a85e3680..fc4f6ced054 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java @@ -17,6 +17,7 @@ package com.android.settings.biometrics.face; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Intent; import android.hardware.face.FaceManager; @@ -27,7 +28,6 @@ import android.widget.Button; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.biometrics.BiometricEnrollIntroduction; @@ -179,7 +179,7 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.FACE_ENROLL_INTRO; + return SettingsEnums.FACE_ENROLL_INTRO; } @Override diff --git a/src/com/android/settings/biometrics/face/FaceEnrollPreviewFragment.java b/src/com/android/settings/biometrics/face/FaceEnrollPreviewFragment.java index a5435845c06..880671274e8 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollPreviewFragment.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollPreviewFragment.java @@ -16,6 +16,7 @@ package com.android.settings.biometrics.face; +import android.app.settings.SettingsEnums; import android.content.Context; import android.graphics.SurfaceTexture; import android.hardware.camera2.CameraAccessException; @@ -36,7 +37,6 @@ import android.view.TextureView; import android.view.View; import android.widget.ImageView; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.biometrics.BiometricEnrollSidecar; import com.android.settings.core.InstrumentedPreferenceFragment; @@ -180,7 +180,7 @@ public class FaceEnrollPreviewFragment extends InstrumentedPreferenceFragment @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.FACE_ENROLL_PREVIEW; + return SettingsEnums.FACE_ENROLL_PREVIEW; } @Override diff --git a/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java b/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java index 75195305093..c75f300aa8e 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java @@ -17,14 +17,13 @@ package com.android.settings.biometrics.face; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.hardware.face.FaceManager; import android.os.UserHandle; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.Utils; import com.android.settings.biometrics.BiometricEnrollSidecar; -import java.util.ArrayList; import java.util.Arrays; /** @@ -78,6 +77,6 @@ public class FaceEnrollSidecar extends BiometricEnrollSidecar { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.FACE_ENROLL_SIDECAR; + return SettingsEnums.FACE_ENROLL_SIDECAR; } } diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java index ada39de1ecf..4e2c7110668 100644 --- a/src/com/android/settings/biometrics/face/FaceSettings.java +++ b/src/com/android/settings/biometrics/face/FaceSettings.java @@ -21,6 +21,7 @@ import static android.app.Activity.RESULT_OK; import static com.android.settings.biometrics.BiometricEnrollBase.CONFIRM_REQUEST; import static com.android.settings.biometrics.BiometricEnrollBase.RESULT_FINISHED; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.hardware.face.FaceManager; @@ -29,7 +30,6 @@ import android.os.UserHandle; import android.provider.SearchIndexableResource; import android.util.Log; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.dashboard.DashboardFragment; @@ -68,7 +68,7 @@ public class FaceSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.FACE; + return SettingsEnums.FACE; } @Override diff --git a/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java index 2e32bf3df60..b910fe5f985 100644 --- a/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java @@ -19,12 +19,12 @@ package com.android.settings.biometrics.face; import android.content.Context; import android.hardware.face.FaceManager; -import com.android.settings.Utils; -import com.android.settings.core.TogglePreferenceController; - import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import com.android.settings.Utils; +import com.android.settings.core.TogglePreferenceController; + /** * Preference controller that manages the ability to use face authentication with/without * user attention. See {@link FaceManager#setRequireAttention(boolean, byte[])}. diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java index 0b92326e8cb..f5aae124f3e 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java @@ -16,11 +16,11 @@ package com.android.settings.biometrics.fingerprint; +import android.app.settings.SettingsEnums; import android.hardware.fingerprint.FingerprintManager; import android.hardware.fingerprint.FingerprintManager.AuthenticationResult; import android.os.CancellationSignal; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.InstrumentedFragment; /** @@ -55,7 +55,7 @@ public class FingerprintAuthenticateSidecar extends InstrumentedFragment { @Override public int getMetricsCategory() { - return MetricsEvent.FINGERPRINT_AUTHENTICATE_SIDECAR; + return SettingsEnums.FINGERPRINT_AUTHENTICATE_SIDECAR; } private FingerprintManager.AuthenticationCallback mAuthenticationCallback = diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java index 4c1ca62c570..3292b8da00d 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java @@ -19,6 +19,7 @@ package com.android.settings.biometrics.fingerprint; import android.animation.Animator; import android.animation.ObjectAnimator; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.content.Intent; import android.graphics.drawable.Animatable2; @@ -40,7 +41,6 @@ import android.widget.TextView; import androidx.appcompat.app.AlertDialog; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.biometrics.BiometricEnrollSidecar; import com.android.settings.biometrics.BiometricErrorDialog; @@ -112,7 +112,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_FINGERPINT_ERROR; + return SettingsEnums.DIALOG_FINGERPINT_ERROR; } @Override @@ -419,7 +419,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { @Override public int getMetricsCategory() { - return MetricsEvent.FINGERPRINT_ENROLLING; + return SettingsEnums.FINGERPRINT_ENROLLING; } public static class IconTouchDialog extends InstrumentedDialogFragment { @@ -441,7 +441,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_FINGERPRINT_ICON_TOUCH; + return SettingsEnums.DIALOG_FINGERPRINT_ICON_TOUCH; } } } diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java index 72e115ba1c7..7ed8d7d5403 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java @@ -16,6 +16,7 @@ package com.android.settings.biometrics.fingerprint; +import android.app.settings.SettingsEnums; import android.content.Intent; import android.hardware.fingerprint.FingerprintManager; import android.os.Bundle; @@ -23,12 +24,12 @@ import android.view.View; import androidx.annotation.Nullable; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.biometrics.BiometricEnrollBase; import com.android.settings.biometrics.BiometricEnrollSidecar.Listener; import com.android.settings.password.ChooseLockSettingsHelper; + import com.google.android.setupcompat.item.FooterButton; import com.google.android.setupcompat.template.ButtonFooterMixin; @@ -190,6 +191,6 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase { @Override public int getMetricsCategory() { - return MetricsEvent.FINGERPRINT_FIND_SENSOR; + return SettingsEnums.FINGERPRINT_FIND_SENSOR; } } diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java index 4cf3a46238a..61128a3efe0 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java @@ -16,12 +16,12 @@ package com.android.settings.biometrics.fingerprint; +import android.app.settings.SettingsEnums; import android.content.Intent; import android.hardware.fingerprint.FingerprintManager; import android.os.Bundle; import android.view.View; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.biometrics.BiometricEnrollBase; @@ -105,6 +105,6 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase { @Override public int getMetricsCategory() { - return MetricsEvent.FINGERPRINT_ENROLL_FINISH; + return SettingsEnums.FINGERPRINT_ENROLL_FINISH; } } diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java index f603e246c2b..2ad4ada74ef 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java @@ -17,6 +17,7 @@ package com.android.settings.biometrics.fingerprint; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.ActivityNotFoundException; import android.content.Intent; import android.hardware.fingerprint.FingerprintManager; @@ -24,7 +25,6 @@ import android.os.Bundle; import android.util.Log; import android.widget.TextView; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.biometrics.BiometricEnrollIntroduction; @@ -156,7 +156,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.FINGERPRINT_ENROLL_INTRO; + return SettingsEnums.FINGERPRINT_ENROLL_INTRO; } @Override diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java index 27d71cd64c2..b72a8027793 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java @@ -17,10 +17,10 @@ package com.android.settings.biometrics.fingerprint; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.hardware.fingerprint.FingerprintManager; import android.os.UserHandle; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.Utils; import com.android.settings.biometrics.BiometricEnrollSidecar; @@ -68,6 +68,6 @@ public class FingerprintEnrollSidecar extends BiometricEnrollSidecar { @Override public int getMetricsCategory() { - return MetricsEvent.FINGERPRINT_ENROLL_SIDECAR; + return SettingsEnums.FINGERPRINT_ENROLL_SIDECAR; } } diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java index 25cd2f52e8f..19d0518b9db 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java @@ -17,13 +17,13 @@ package com.android.settings.biometrics.fingerprint; import android.annotation.Nullable; +import android.app.settings.SettingsEnums; import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; import android.os.Bundle; import android.os.UserHandle; import android.util.Log; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.InstrumentedFragment; import java.util.LinkedList; @@ -130,7 +130,7 @@ public class FingerprintRemoveSidecar extends InstrumentedFragment { @Override public int getMetricsCategory() { - return MetricsEvent.FINGERPRINT_REMOVE_SIDECAR; + return SettingsEnums.FINGERPRINT_REMOVE_SIDECAR; } } diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java index 2e67ec3e48f..4c7276dac36 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java @@ -20,6 +20,7 @@ package com.android.settings.biometrics.fingerprint; import android.app.Activity; import android.app.Dialog; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -33,8 +34,6 @@ import android.os.UserManager; import android.text.TextUtils; import android.util.Log; import android.view.View; -import android.view.WindowManager; -import android.widget.EditText; import android.widget.Toast; import androidx.annotation.VisibleForTesting; @@ -45,7 +44,6 @@ import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceViewHolder; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SubSettings; @@ -266,7 +264,7 @@ public class FingerprintSettings extends SubSettings { @Override public int getMetricsCategory() { - return MetricsEvent.FINGERPRINT; + return SettingsEnums.FINGERPRINT; } @Override @@ -672,7 +670,7 @@ public class FingerprintSettings extends SubSettings { @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_FINGERPINT_EDIT; + return SettingsEnums.DIALOG_FINGERPINT_EDIT; } @Override @@ -697,7 +695,7 @@ public class FingerprintSettings extends SubSettings { final int fingerprintId = mFp.getBiometricId(); Log.v(TAG, "Removing fpId=" + fingerprintId); mMetricsFeatureProvider.action(getContext(), - MetricsEvent.ACTION_FINGERPRINT_DELETE, + SettingsEnums.ACTION_FINGERPRINT_DELETE, fingerprintId); FingerprintSettingsFragment parent = (FingerprintSettingsFragment) getTargetFragment(); @@ -744,7 +742,7 @@ public class FingerprintSettings extends SubSettings { if (!TextUtils.equals(newName, name)) { Log.d(TAG, "rename " + name + " to " + newName); mMetricsFeatureProvider.action(getContext(), - MetricsEvent.ACTION_FINGERPRINT_RENAME, + SettingsEnums.ACTION_FINGERPRINT_RENAME, mFp.getBiometricId()); FingerprintSettingsFragment parent = (FingerprintSettingsFragment) @@ -796,7 +794,7 @@ public class FingerprintSettings extends SubSettings { @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_FINGERPINT_EDIT; + return SettingsEnums.DIALOG_FINGERPINT_EDIT; } } @@ -806,7 +804,7 @@ public class FingerprintSettings extends SubSettings { @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_FINGERPINT_DELETE_LAST; + return SettingsEnums.DIALOG_FINGERPINT_DELETE_LAST; } @Override diff --git a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollEnrolling.java index c2c4930a5e3..a86711d936c 100644 --- a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollEnrolling.java @@ -16,9 +16,9 @@ package com.android.settings.biometrics.fingerprint; +import android.app.settings.SettingsEnums; import android.content.Intent; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.SetupWizardUtils; public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling { @@ -32,6 +32,6 @@ public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling @Override public int getMetricsCategory() { - return MetricsEvent.FINGERPRINT_ENROLLING_SETUP; + return SettingsEnums.FINGERPRINT_ENROLLING_SETUP; } } diff --git a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java index 5f1a240bdce..8097adc701f 100644 --- a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java +++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java @@ -18,6 +18,7 @@ package com.android.settings.biometrics.fingerprint; import android.app.Activity; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; @@ -28,8 +29,6 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentManager; -import com.android.internal.logging.nano.MetricsProto; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SetupWizardUtils; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -60,7 +59,7 @@ public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSenso @Override public int getMetricsCategory() { - return MetricsEvent.FINGERPRINT_FIND_SENSOR_SETUP; + return SettingsEnums.FINGERPRINT_FIND_SENSOR_SETUP; } public static class SkipFingerprintDialog extends InstrumentedDialogFragment @@ -69,7 +68,7 @@ public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSenso @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_FINGERPRINT_SKIP_SETUP; + return SettingsEnums.DIALOG_FINGERPRINT_SKIP_SETUP; } @Override diff --git a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java index 6afbb84ecd5..24a0069c327 100644 --- a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java +++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java @@ -16,11 +16,10 @@ package com.android.settings.biometrics.fingerprint; +import android.app.settings.SettingsEnums; import android.content.Intent; import android.os.UserHandle; -import android.widget.Button; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SetupWizardUtils; import com.android.settings.password.ChooseLockSettingsHelper; @@ -49,6 +48,6 @@ public class SetupFingerprintEnrollFinish extends FingerprintEnrollFinish { @Override public int getMetricsCategory() { - return MetricsEvent.FINGERPRINT_ENROLL_FINISH_SETUP; + return SettingsEnums.FINGERPRINT_ENROLL_FINISH_SETUP; } } diff --git a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java index a74bbbad962..6a92eba1c43 100644 --- a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java @@ -19,6 +19,7 @@ package com.android.settings.biometrics.fingerprint; import android.app.Activity; import android.app.KeyguardManager; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; @@ -26,7 +27,6 @@ import android.os.storage.StorageManager; import android.view.View; import android.widget.TextView; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.SetupWizardUtils; @@ -148,6 +148,6 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu @Override public int getMetricsCategory() { - return MetricsEvent.FINGERPRINT_ENROLL_INTRO_SETUP; + return SettingsEnums.FINGERPRINT_ENROLL_INTRO_SETUP; } } diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java index 18aeaa0b124..a41b7917c2e 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java @@ -20,7 +20,6 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.util.Pair; -import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java index b2f917b71db..c3d49e9be94 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java @@ -18,17 +18,17 @@ package com.android.settings.bluetooth; import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH; +import android.app.settings.SettingsEnums; import android.bluetooth.BluetoothDevice; import android.content.Context; import android.os.Bundle; import android.util.FeatureFlagUtils; - -import androidx.annotation.VisibleForTesting; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import com.android.internal.logging.nano.MetricsProto; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.core.FeatureFlags; import com.android.settings.dashboard.RestrictedDashboardFragment; @@ -119,7 +119,7 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.BLUETOOTH_DEVICE_DETAILS; + return SettingsEnums.BLUETOOTH_DEVICE_DETAILS; } @Override diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java index 5f71948854e..d4c0ed099fc 100644 --- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java +++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java @@ -18,6 +18,7 @@ package com.android.settings.bluetooth; import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH; +import android.app.settings.SettingsEnums; import android.bluetooth.BluetoothDevice; import android.content.Context; import android.content.DialogInterface; @@ -34,7 +35,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; import com.android.settings.widget.GearPreference; @@ -203,18 +203,18 @@ public final class BluetoothDevicePreference extends GearPreference implements if (mCachedDevice.isConnected()) { metricsFeatureProvider.action(context, - MetricsEvent.ACTION_SETTINGS_BLUETOOTH_DISCONNECT); + SettingsEnums.ACTION_SETTINGS_BLUETOOTH_DISCONNECT); askDisconnect(); } else if (bondState == BluetoothDevice.BOND_BONDED) { metricsFeatureProvider.action(context, - MetricsEvent.ACTION_SETTINGS_BLUETOOTH_CONNECT); + SettingsEnums.ACTION_SETTINGS_BLUETOOTH_CONNECT); mCachedDevice.connect(true); } else if (bondState == BluetoothDevice.BOND_NONE) { metricsFeatureProvider.action(context, - MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR); + SettingsEnums.ACTION_SETTINGS_BLUETOOTH_PAIR); if (!mCachedDevice.hasHumanReadableName()) { metricsFeatureProvider.action(context, - MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR_DEVICES_WITHOUT_NAMES); + SettingsEnums.ACTION_SETTINGS_BLUETOOTH_PAIR_DEVICES_WITHOUT_NAMES); } pair(); } diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java index 1d782b11f1d..1c7566948e2 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; +import android.app.settings.SettingsEnums; import android.content.Context; import android.text.TextUtils; @@ -23,7 +24,6 @@ import androidx.annotation.VisibleForTesting; import androidx.fragment.app.Fragment; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -65,7 +65,7 @@ public class BluetoothDeviceRenamePreferenceController extends public boolean handlePreferenceTreeClick(Preference preference) { if (TextUtils.equals(getPreferenceKey(), preference.getKey()) && mFragment != null) { mMetricsFeatureProvider.action(mContext, - MetricsProto.MetricsEvent.ACTION_BLUETOOTH_RENAME); + SettingsEnums.ACTION_BLUETOOTH_RENAME); LocalDeviceNameDialogFragment.newInstance() .show(mFragment.getFragmentManager(), LocalDeviceNameDialogFragment.TAG); return true; diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java index 2ea33717be2..2128b2f4bb1 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java @@ -19,7 +19,6 @@ import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.content.Context; import android.os.Bundle; -import android.os.SystemProperties; import android.util.Log; import androidx.annotation.VisibleForTesting; diff --git a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java index 3f566f0373a..e96fba342a5 100644 --- a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -23,7 +24,6 @@ import android.content.pm.PackageManager; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; @@ -69,7 +69,7 @@ public class BluetoothFilesPreferenceController extends BasePreferenceController public boolean handlePreferenceTreeClick(Preference preference) { if (KEY_RECEIVED_FILES.equals(preference.getKey())) { mMetricsFeatureProvider.action(mContext, - MetricsProto.MetricsEvent.ACTION_BLUETOOTH_FILES); + SettingsEnums.ACTION_BLUETOOTH_FILES); Intent intent = new Intent(ACTION_OPEN_FILES); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP); intent.putExtra(EXTRA_DIRECTION, 1 /* DIRECTION_INBOUND */); diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java index 688ac008922..b1a31748ba0 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java @@ -18,6 +18,7 @@ package com.android.settings.bluetooth; import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH; +import android.app.settings.SettingsEnums; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.content.Context; @@ -27,7 +28,6 @@ import android.widget.Toast; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.Indexable; import com.android.settingslib.bluetooth.BluetoothDeviceFilter; @@ -114,7 +114,7 @@ public class BluetoothPairingDetail extends DeviceListPreferenceFragment impleme @Override public int getMetricsCategory() { - return MetricsEvent.BLUETOOTH_PAIRING; + return SettingsEnums.BLUETOOTH_PAIRING; } @Override diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java index f8a2bbe9aef..d38302d8830 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; @@ -37,7 +38,6 @@ import android.widget.TextView; import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -113,7 +113,7 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i @Override public int getMetricsCategory() { - return MetricsEvent.BLUETOOTH_DIALOG_FRAGMENT; + return SettingsEnums.BLUETOOTH_DIALOG_FRAGMENT; } /** diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java index 19339cd60ec..4dd9a4042ef 100644 --- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java +++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java @@ -33,9 +33,6 @@ import androidx.preference.Preference; import com.android.internal.app.AlertActivity; import com.android.internal.app.AlertController; import com.android.settings.R; -import com.android.settingslib.bluetooth.CachedBluetoothDevice; -import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; -import com.android.settingslib.bluetooth.LocalBluetoothManager; /** * BluetoothPermissionActivity shows a dialog for accepting incoming diff --git a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java index 67e8b1985f5..59b8007b68e 100644 --- a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java +++ b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java @@ -19,6 +19,7 @@ import static android.app.slice.Slice.EXTRA_TOGGLE_STATE; import android.annotation.ColorInt; import android.app.PendingIntent; +import android.app.settings.SettingsEnums; import android.bluetooth.BluetoothAdapter; import android.content.Context; import android.content.Intent; @@ -32,7 +33,6 @@ import androidx.slice.builders.ListBuilder; import androidx.slice.builders.ListBuilder.RowBuilder; import androidx.slice.builders.SliceAction; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SubSettings; import com.android.settings.connecteddevice.BluetoothDashboardFragment; @@ -98,7 +98,7 @@ public class BluetoothSliceBuilder { SettingsSlicesContract.KEY_BLUETOOTH).build(); return SliceBuilderUtils.buildSearchResultPageIntent(context, BluetoothDashboardFragment.class.getName(), null /* key */, screenTitle, - MetricsProto.MetricsEvent.SETTINGS_CONNECTED_DEVICE_CATEGORY) + SettingsEnums.SETTINGS_CONNECTED_DEVICE_CATEGORY) .setClassName(context.getPackageName(), SubSettings.class.getName()) .setData(contentUri); } diff --git a/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java index e0aa9e9c681..48376a779af 100644 --- a/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java @@ -15,13 +15,12 @@ */ package com.android.settings.bluetooth; +import android.app.settings.SettingsEnums; import android.content.Context; import android.view.View; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settings.location.ScanningSettings; @@ -67,7 +66,7 @@ public class BluetoothSwitchPreferenceController mBluetoothEnabler = new BluetoothEnabler(context, switchController, FeatureFactory.getFactory(context).getMetricsFeatureProvider(), - MetricsEvent.ACTION_SETTINGS_MASTER_SWITCH_BLUETOOTH_TOGGLE, + SettingsEnums.ACTION_SETTINGS_MASTER_SWITCH_BLUETOOTH_TOGGLE, mRestrictionUtils); mBluetoothEnabler.setToggleCallback(this); } @@ -96,7 +95,7 @@ public class BluetoothSwitchPreferenceController // send users to scanning settings if they click on the link in the summary text new SubSettingLauncher(mContext) .setDestination(ScanningSettings.class.getName()) - .setSourceMetricsCategory(MetricsProto.MetricsEvent.BLUETOOTH_FRAGMENT) + .setSourceMetricsCategory(SettingsEnums.BLUETOOTH_FRAGMENT) .launch(); } diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java index 38936f50ca7..207b375cd36 100644 --- a/src/com/android/settings/bluetooth/DevicePickerFragment.java +++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java @@ -18,6 +18,7 @@ package com.android.settings.bluetooth; import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH; +import android.app.settings.SettingsEnums; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothDevicePicker; @@ -30,7 +31,6 @@ import android.view.MenuInflater; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.AbstractPreferenceController; @@ -75,7 +75,7 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment { @Override public int getMetricsCategory() { - return MetricsEvent.BLUETOOTH_DEVICE_PICKER; + return SettingsEnums.BLUETOOTH_DEVICE_PICKER; } @Override diff --git a/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java b/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java index 33e2ab39a20..db6b8325a29 100644 --- a/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java +++ b/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java @@ -18,6 +18,7 @@ package com.android.settings.bluetooth; import android.app.Activity; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.bluetooth.BluetoothDevice; import android.content.Context; import android.content.DialogInterface; @@ -26,7 +27,6 @@ import android.os.Bundle; import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settingslib.bluetooth.CachedBluetoothDevice; @@ -58,7 +58,7 @@ public class ForgetDeviceDialogFragment extends InstrumentedDialogFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_BLUETOOTH_PAIRED_DEVICE_FORGET; + return SettingsEnums.DIALOG_BLUETOOTH_PAIRED_DEVICE_FORGET; } @Override diff --git a/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragment.java b/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragment.java index 4cbcce8a556..5cf2ccc314c 100644 --- a/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragment.java +++ b/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragment.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; +import android.app.settings.SettingsEnums; import android.bluetooth.BluetoothAdapter; import android.content.BroadcastReceiver; import android.content.Context; @@ -23,7 +24,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; /** Provides a dialog for changing the advertised name of the local bluetooth adapter. */ @@ -71,7 +71,7 @@ public class LocalDeviceNameDialogFragment extends BluetoothNameDialogFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_BLUETOOTH_RENAME; + return SettingsEnums.DIALOG_BLUETOOTH_RENAME; } @Override diff --git a/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java b/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java index 7894ed6d5fe..2ba94a19189 100644 --- a/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java +++ b/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java @@ -16,13 +16,13 @@ package com.android.settings.bluetooth; +import android.app.settings.SettingsEnums; import android.bluetooth.BluetoothDevice; import android.content.Context; import android.os.Bundle; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothManager; @@ -58,7 +58,7 @@ public class RemoteDeviceNameDialogFragment extends BluetoothNameDialogFragment @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_BLUETOOTH_PAIRED_DEVICE_RENAME; + return SettingsEnums.DIALOG_BLUETOOTH_PAIRED_DEVICE_RENAME; } @Override diff --git a/src/com/android/settings/bluetooth/Utils.java b/src/com/android/settings/bluetooth/Utils.java index fd6bbc34cae..d6e395e0c31 100755 --- a/src/com/android/settings/bluetooth/Utils.java +++ b/src/com/android/settings/bluetooth/Utils.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; +import android.app.settings.SettingsEnums; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; @@ -27,7 +28,6 @@ import android.widget.Toast; import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.bluetooth.BluetoothUtils; @@ -90,15 +90,10 @@ public final class Utils { return dialog; } - // TODO: wire this up to show connection errors... - static void showConnectingError(Context context, String name) { - showConnectingError(context, name, getLocalBtManager(context)); - } - @VisibleForTesting static void showConnectingError(Context context, String name, LocalBluetoothManager manager) { FeatureFactory.getFactory(context).getMetricsFeatureProvider().visible(context, - MetricsEvent.VIEW_UNKNOWN, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_CONNECT_ERROR); + SettingsEnums.PAGE_UNKNOWN, SettingsEnums.ACTION_SETTINGS_BLUETOOTH_CONNECT_ERROR); showError(context, name, R.string.bluetooth_connecting_error_message, manager); } diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java index 54842f71f81..0d130d92122 100644 --- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java @@ -15,11 +15,11 @@ */ package com.android.settings.connecteddevice; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.pm.PackageManager; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.bluetooth.BluetoothFilesPreferenceController; import com.android.settings.dashboard.DashboardFragment; @@ -46,7 +46,7 @@ public class AdvancedConnectedDeviceDashboardFragment extends DashboardFragment @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.CONNECTION_DEVICE_ADVANCED; + return SettingsEnums.CONNECTION_DEVICE_ADVANCED; } @Override diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java index b5a9ffbd49f..ecbda15bd2f 100644 --- a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java @@ -15,12 +15,12 @@ */ package com.android.settings.connecteddevice; +import android.app.settings.SettingsEnums; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothManager; import android.content.Context; import android.os.Bundle; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.bluetooth.BluetoothDeviceRenamePreferenceController; @@ -54,7 +54,7 @@ public class BluetoothDashboardFragment extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.BLUETOOTH_FRAGMENT; + return SettingsEnums.BLUETOOTH_FRAGMENT; } @Override diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java index 223b78ff95e..b84cc26812e 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java @@ -15,12 +15,12 @@ */ package com.android.settings.connecteddevice; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -44,7 +44,7 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_CONNECTED_DEVICE_CATEGORY; + return SettingsEnums.SETTINGS_CONNECTED_DEVICE_CATEGORY; } @Override diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java index c543b7a3bdb..709e1dc1c42 100644 --- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java @@ -15,10 +15,10 @@ */ package com.android.settings.connecteddevice; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.res.Resources; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -54,7 +54,7 @@ public class PreviouslyConnectedDeviceDashboardFragment extends DashboardFragmen @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.PREVIOUSLY_CONNECTED_DEVICES; + return SettingsEnums.PREVIOUSLY_CONNECTED_DEVICES; } @Override diff --git a/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java b/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java index 4b2bdc05d80..21022838d2b 100644 --- a/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java +++ b/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java @@ -18,8 +18,8 @@ package com.android.settings.connecteddevice; import android.content.Context; -import com.android.settings.core.BasePreferenceController; import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; public class TopLevelConnectedDevicesPreferenceController extends BasePreferenceController { diff --git a/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java b/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java index beb23757e60..695a714528a 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java +++ b/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java @@ -20,7 +20,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.hardware.usb.UsbManager; -import android.hardware.usb.UsbPort; import android.hardware.usb.UsbPortStatus; import com.android.settingslib.core.lifecycle.LifecycleObserver; diff --git a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java index 5057abe10e3..4c00c3ea07b 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java @@ -18,16 +18,15 @@ package com.android.settings.connecteddevice.usb; import static android.net.ConnectivityManager.TETHERING_USB; +import android.app.settings.SettingsEnums; import android.content.Context; import android.graphics.drawable.Drawable; import android.hardware.usb.UsbManager; import android.net.ConnectivityManager; import android.os.Bundle; -import android.util.Log; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.widget.RadioButtonPickerFragment; @@ -70,7 +69,7 @@ public class UsbDefaultFragment extends RadioButtonPickerFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.USB_DEFAULT; + return SettingsEnums.USB_DEFAULT; } @Override diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java index a584c11fa06..01977d8952a 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java @@ -21,7 +21,6 @@ import static android.hardware.usb.UsbPortStatus.DATA_ROLE_HOST; import static android.hardware.usb.UsbPortStatus.DATA_ROLE_NONE; import android.content.Context; -import android.hardware.usb.UsbPort; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java index 936a4c00de6..6d8de6d5a22 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java @@ -16,12 +16,12 @@ package com.android.settings.connecteddevice.usb; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -56,7 +56,7 @@ public class UsbDetailsFragment extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.USB_DEVICE_DETAILS; + return SettingsEnums.USB_DEVICE_DETAILS; } @Override diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java index 283e56bd9a0..77ae13ffb04 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java @@ -21,7 +21,6 @@ import static android.net.ConnectivityManager.TETHERING_USB; import android.content.Context; import android.hardware.usb.UsbManager; -import android.hardware.usb.UsbPort; import android.net.ConnectivityManager; import androidx.annotation.VisibleForTesting; diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java index b59890aa61e..42c5bae91d3 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java @@ -21,8 +21,6 @@ import static android.hardware.usb.UsbPortStatus.POWER_ROLE_SINK; import static android.hardware.usb.UsbPortStatus.POWER_ROLE_SOURCE; import android.content.Context; -import android.hardware.usb.UsbPort; -import android.hardware.usb.UsbPortStatus; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; diff --git a/src/com/android/settings/core/instrumentation/StatsLogWriter.java b/src/com/android/settings/core/instrumentation/StatsLogWriter.java index b6644c677fa..bcdecf35de2 100644 --- a/src/com/android/settings/core/instrumentation/StatsLogWriter.java +++ b/src/com/android/settings/core/instrumentation/StatsLogWriter.java @@ -18,8 +18,8 @@ package com.android.settings.core.instrumentation; import android.app.settings.SettingsEnums; import android.content.Context; -import android.util.StatsLog; import android.util.Pair; +import android.util.StatsLog; import com.android.settingslib.core.instrumentation.LogWriter; diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java index 2a6bb388c32..f79cf5bdc48 100644 --- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java +++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java @@ -20,6 +20,7 @@ import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_ICON import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_SUMMARY; import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_SUMMARY_URI; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; import android.content.IContentProvider; @@ -38,7 +39,6 @@ import androidx.annotation.VisibleForTesting; import androidx.fragment.app.FragmentActivity; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.dashboard.profileselector.ProfileSelectDialog; @@ -160,9 +160,9 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider { } final Intent intent = new Intent(tile.getIntent()) .putExtra(MetricsFeatureProvider.EXTRA_SOURCE_METRICS_CATEGORY, - MetricsEvent.DASHBOARD_SUMMARY) + SettingsEnums.DASHBOARD_SUMMARY) .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); - launchIntentOrSelectProfile(activity, tile, intent, MetricsEvent.DASHBOARD_SUMMARY); + launchIntentOrSelectProfile(activity, tile, intent, SettingsEnums.DASHBOARD_SUMMARY); } private void bindSummary(Preference preference, Tile tile) { diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java index e2c013d663f..dde98ce0a4d 100644 --- a/src/com/android/settings/dashboard/DashboardFragment.java +++ b/src/com/android/settings/dashboard/DashboardFragment.java @@ -32,7 +32,6 @@ import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerListHelper; @@ -235,7 +234,7 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment @Override public void onExpandButtonClick() { mMetricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN, - MetricsEvent.ACTION_SETTINGS_ADVANCED_BUTTON_EXPAND, + SettingsEnums.ACTION_SETTINGS_ADVANCED_BUTTON_EXPAND, getMetricsCategory(), null, 0); } diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java index b6c95dd4a17..329bf68fe6a 100644 --- a/src/com/android/settings/datausage/AppDataUsage.java +++ b/src/com/android/settings/datausage/AppDataUsage.java @@ -17,6 +17,7 @@ package com.android.settings.datausage; import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -38,7 +39,6 @@ import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceCategory; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppInfoBase; import com.android.settings.widget.EntityHeaderController; @@ -348,7 +348,7 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC @Override public int getMetricsCategory() { - return MetricsEvent.APP_DATA_USAGE; + return SettingsEnums.APP_DATA_USAGE; } private AdapterView.OnItemSelectedListener mCycleListener = diff --git a/src/com/android/settings/datausage/BillingCyclePreference.java b/src/com/android/settings/datausage/BillingCyclePreference.java index b30f32e0ff0..23c577c3d84 100644 --- a/src/com/android/settings/datausage/BillingCyclePreference.java +++ b/src/com/android/settings/datausage/BillingCyclePreference.java @@ -14,6 +14,7 @@ package com.android.settings.datausage; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.net.NetworkTemplate; @@ -23,7 +24,6 @@ import android.util.AttributeSet; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settings.datausage.CellDataPreference.DataStateListener; @@ -79,7 +79,7 @@ public class BillingCyclePreference extends Preference implements TemplatePrefer .setDestination(BillingCycleSettings.class.getName()) .setArguments(args) .setTitleRes(R.string.billing_cycle) - .setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN) + .setSourceMetricsCategory(SettingsEnums.PAGE_UNKNOWN) .toIntent(); } diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java index 45997f8efc3..87b8198a007 100644 --- a/src/com/android/settings/datausage/BillingCycleSettings.java +++ b/src/com/android/settings/datausage/BillingCycleSettings.java @@ -18,6 +18,7 @@ import static android.net.NetworkPolicy.LIMIT_DISABLED; import static android.net.NetworkPolicy.WARNING_DISABLED; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.content.res.Resources; @@ -39,7 +40,6 @@ import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -193,7 +193,7 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements @Override public int getMetricsCategory() { - return MetricsEvent.BILLING_CYCLE; + return SettingsEnums.BILLING_CYCLE; } @Override @@ -340,7 +340,7 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_BILLING_BYTE_LIMIT; + return SettingsEnums.DIALOG_BILLING_BYTE_LIMIT; } } @@ -366,7 +366,7 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_BILLING_CYCLE; + return SettingsEnums.DIALOG_BILLING_CYCLE; } @Override @@ -446,7 +446,7 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_BILLING_CONFIRM_LIMIT; + return SettingsEnums.DIALOG_BILLING_CONFIRM_LIMIT; } @Override diff --git a/src/com/android/settings/datausage/CellDataPreference.java b/src/com/android/settings/datausage/CellDataPreference.java index 9c6be468b3d..af7e16e2219 100644 --- a/src/com/android/settings/datausage/CellDataPreference.java +++ b/src/com/android/settings/datausage/CellDataPreference.java @@ -14,6 +14,7 @@ package com.android.settings.datausage; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.database.ContentObserver; @@ -37,7 +38,6 @@ import androidx.appcompat.app.AlertDialog.Builder; import androidx.core.content.res.TypedArrayUtils; import androidx.preference.PreferenceViewHolder; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.overlay.FeatureFactory; @@ -136,7 +136,7 @@ public class CellDataPreference extends CustomDialogPreferenceCompat implements protected void performClick(View view) { final Context context = getContext(); FeatureFactory.getFactory(context).getMetricsFeatureProvider() - .action(context, MetricsEvent.ACTION_CELL_DATA_TOGGLE, !mChecked); + .action(context, SettingsEnums.ACTION_CELL_DATA_TOGGLE, !mChecked); final SubscriptionInfo currentSir = mSubscriptionManager.getActiveSubscriptionInfo( mSubId); final SubscriptionInfo nextSir = mSubscriptionManager.getDefaultDataSubscriptionInfo(); diff --git a/src/com/android/settings/datausage/DataSaverBackend.java b/src/com/android/settings/datausage/DataSaverBackend.java index ed2e6c9195c..de28b07fcb3 100644 --- a/src/com/android/settings/datausage/DataSaverBackend.java +++ b/src/com/android/settings/datausage/DataSaverBackend.java @@ -18,13 +18,13 @@ import static android.net.NetworkPolicyManager.POLICY_ALLOW_METERED_BACKGROUND; import static android.net.NetworkPolicyManager.POLICY_NONE; import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND; +import android.app.settings.SettingsEnums; import android.content.Context; import android.net.INetworkPolicyListener; import android.net.NetworkPolicyManager; import android.os.RemoteException; import android.util.SparseIntArray; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.utils.ThreadUtils; @@ -73,7 +73,7 @@ public class DataSaverBackend { public void setDataSaverEnabled(boolean enabled) { mPolicyManager.setRestrictBackground(enabled); mMetricsFeatureProvider.action( - mContext, MetricsEvent.ACTION_DATA_SAVER_MODE, enabled ? 1 : 0); + mContext, SettingsEnums.ACTION_DATA_SAVER_MODE, enabled ? 1 : 0); } public void refreshWhitelist() { @@ -86,7 +86,7 @@ public class DataSaverBackend { mUidPolicies.put(uid, policy); if (whitelisted) { mMetricsFeatureProvider.action( - mContext, MetricsEvent.ACTION_DATA_SAVER_WHITELIST, packageName); + mContext, SettingsEnums.ACTION_DATA_SAVER_WHITELIST, packageName); } } @@ -116,7 +116,7 @@ public class DataSaverBackend { mUidPolicies.put(uid, policy); if (blacklisted) { mMetricsFeatureProvider.action( - mContext, MetricsEvent.ACTION_DATA_SAVER_BLACKLIST, packageName); + mContext, SettingsEnums.ACTION_DATA_SAVER_BLACKLIST, packageName); } } diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java index f4013424ddd..1ab8c79ad9d 100644 --- a/src/com/android/settings/datausage/DataSaverSummary.java +++ b/src/com/android/settings/datausage/DataSaverSummary.java @@ -15,6 +15,7 @@ package com.android.settings.datausage; import android.app.Application; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; @@ -23,7 +24,6 @@ import android.widget.Switch; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; @@ -113,7 +113,7 @@ public class DataSaverSummary extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.DATA_SAVER_SUMMARY; + return SettingsEnums.DATA_SAVER_SUMMARY; } @Override diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java index 3369e5e47ce..aa6619755d1 100644 --- a/src/com/android/settings/datausage/DataUsageList.java +++ b/src/com/android/settings/datausage/DataUsageList.java @@ -22,6 +22,7 @@ import static android.net.TrafficStats.UID_TETHERING; import android.app.Activity; import android.app.ActivityManager; +import android.app.settings.SettingsEnums; import android.app.usage.NetworkStats; import android.app.usage.NetworkStats.Bucket; import android.content.Context; @@ -31,16 +32,13 @@ import android.graphics.Color; import android.net.ConnectivityManager; import android.net.NetworkPolicy; import android.net.NetworkTemplate; -import android.os.AsyncTask; import android.os.Bundle; -import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; -import android.text.format.DateUtils; import android.util.Log; import android.util.SparseArray; import android.view.View; @@ -55,14 +53,13 @@ import androidx.loader.content.Loader; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settings.datausage.CycleAdapter.SpinnerInterface; import com.android.settings.widget.LoadingViewController; import com.android.settingslib.AppItem; -import com.android.settingslib.net.NetworkCycleChartDataLoader; import com.android.settingslib.net.NetworkCycleChartData; +import com.android.settingslib.net.NetworkCycleChartDataLoader; import com.android.settingslib.net.NetworkStatsSummaryLoader; import com.android.settingslib.net.UidDetailProvider; @@ -122,7 +119,7 @@ public class DataUsageList extends DataUsageBaseFragment { @Override public int getMetricsCategory() { - return MetricsEvent.DATA_USAGE_LIST; + return SettingsEnums.DATA_USAGE_LIST; } @Override diff --git a/src/com/android/settings/datausage/DataUsagePreference.java b/src/com/android/settings/datausage/DataUsagePreference.java index 21c05037d65..644ea9bf760 100644 --- a/src/com/android/settings/datausage/DataUsagePreference.java +++ b/src/com/android/settings/datausage/DataUsagePreference.java @@ -14,6 +14,7 @@ package com.android.settings.datausage; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.res.TypedArray; @@ -26,7 +27,6 @@ import androidx.annotation.VisibleForTesting; import androidx.core.content.res.TypedArrayUtils; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settingslib.net.DataUsageController; @@ -83,7 +83,7 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc launcher = new SubSettingLauncher(getContext()) .setArguments(args) .setDestination(DataUsageList.class.getName()) - .setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN); + .setSourceMetricsCategory(SettingsEnums.PAGE_UNKNOWN); if (mTemplate.isMatchRuleMobile()) { launcher.setTitleRes(R.string.app_cellular_data_usage); } else { diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java index 97715db0f63..8bf54a7ed82 100644 --- a/src/com/android/settings/datausage/DataUsageSummary.java +++ b/src/com/android/settings/datausage/DataUsageSummary.java @@ -15,6 +15,7 @@ package com.android.settings.datausage; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.Context; import android.net.NetworkTemplate; import android.os.Bundle; @@ -33,7 +34,6 @@ import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.dashboard.SummaryLoader; @@ -242,7 +242,7 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage @Override public int getMetricsCategory() { - return MetricsEvent.DATA_USAGE_SUMMARY; + return SettingsEnums.DATA_USAGE_SUMMARY; } @Override diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java index 92d3e29c317..3cbe1ea4879 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java @@ -17,6 +17,7 @@ package com.android.settings.datausage; import android.annotation.AttrRes; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.graphics.Typeface; @@ -37,7 +38,6 @@ import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settingslib.Utils; @@ -213,7 +213,7 @@ public class DataUsageSummaryPreference extends Preference { final SubSettingLauncher launcher = new SubSettingLauncher(context) .setArguments(args) .setDestination(DataUsageList.class.getName()) - .setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN); + .setSourceMetricsCategory(SettingsEnums.PAGE_UNKNOWN); launcher.setTitleRes(R.string.wifi_data_usage); launcher.launch(); } diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccess.java b/src/com/android/settings/datausage/UnrestrictedDataAccess.java index ff516eed800..d40537f52d6 100644 --- a/src/com/android/settings/datausage/UnrestrictedDataAccess.java +++ b/src/com/android/settings/datausage/UnrestrictedDataAccess.java @@ -14,6 +14,7 @@ package com.android.settings.datausage; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; @@ -22,7 +23,6 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -109,7 +109,7 @@ public class UnrestrictedDataAccess extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.DATA_USAGE_UNRESTRICTED_ACCESS; + return SettingsEnums.DATA_USAGE_UNRESTRICTED_ACCESS; } @Override diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java index efc20f0baa8..d8656caa3b3 100644 --- a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java +++ b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.datausage; import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfMeteredDataRestricted; import android.app.Application; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.UserHandle; @@ -23,7 +24,6 @@ import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppStateBaseBridge; import com.android.settings.core.BasePreferenceController; @@ -225,8 +225,8 @@ public class UnrestrictedDataAccessPreferenceController extends BasePreferenceCo @VisibleForTesting void logSpecialPermissionChange(boolean whitelisted, String packageName) { - final int logCategory = whitelisted ? MetricsEvent.APP_SPECIAL_PERMISSION_UNL_DATA_ALLOW - : MetricsEvent.APP_SPECIAL_PERMISSION_UNL_DATA_DENY; + final int logCategory = whitelisted ? SettingsEnums.APP_SPECIAL_PERMISSION_UNL_DATA_ALLOW + : SettingsEnums.APP_SPECIAL_PERMISSION_UNL_DATA_DENY; FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().action(mContext, logCategory, packageName); } diff --git a/src/com/android/settings/datetime/timezone/FixedOffsetPicker.java b/src/com/android/settings/datetime/timezone/FixedOffsetPicker.java index f134051cf63..a0431cc735c 100644 --- a/src/com/android/settings/datetime/timezone/FixedOffsetPicker.java +++ b/src/com/android/settings/datetime/timezone/FixedOffsetPicker.java @@ -16,9 +16,9 @@ package com.android.settings.datetime.timezone; +import android.app.settings.SettingsEnums; import android.icu.util.TimeZone; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.datetime.timezone.model.TimeZoneData; @@ -45,7 +45,7 @@ public class FixedOffsetPicker extends BaseTimeZoneInfoPicker { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_ZONE_PICKER_FIXED_OFFSET; + return SettingsEnums.SETTINGS_ZONE_PICKER_FIXED_OFFSET; } @Override diff --git a/src/com/android/settings/datetime/timezone/RegionSearchPicker.java b/src/com/android/settings/datetime/timezone/RegionSearchPicker.java index 0abf4e49a54..07986e29a9f 100644 --- a/src/com/android/settings/datetime/timezone/RegionSearchPicker.java +++ b/src/com/android/settings/datetime/timezone/RegionSearchPicker.java @@ -17,6 +17,7 @@ package com.android.settings.datetime.timezone; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.Intent; import android.icu.text.Collator; import android.icu.text.LocaleDisplayNames; @@ -25,7 +26,6 @@ import android.util.Log; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem; @@ -54,7 +54,7 @@ public class RegionSearchPicker extends BaseTimeZonePicker { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_ZONE_PICKER_REGION; + return SettingsEnums.SETTINGS_ZONE_PICKER_REGION; } @Override diff --git a/src/com/android/settings/datetime/timezone/RegionZonePicker.java b/src/com/android/settings/datetime/timezone/RegionZonePicker.java index 83d71f1c8d2..8e4aa055322 100644 --- a/src/com/android/settings/datetime/timezone/RegionZonePicker.java +++ b/src/com/android/settings/datetime/timezone/RegionZonePicker.java @@ -16,6 +16,7 @@ package com.android.settings.datetime.timezone; +import android.app.settings.SettingsEnums; import android.content.Intent; import android.icu.text.Collator; import android.icu.text.LocaleDisplayNames; @@ -26,7 +27,6 @@ import android.util.Log; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.datetime.timezone.model.FilteredCountryTimeZones; import com.android.settings.datetime.timezone.model.TimeZoneData; @@ -55,7 +55,7 @@ public class RegionZonePicker extends BaseTimeZoneInfoPicker { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_ZONE_PICKER_TIME_ZONE; + return SettingsEnums.SETTINGS_ZONE_PICKER_TIME_ZONE; } @Override diff --git a/src/com/android/settings/datetime/timezone/TimeZoneSettings.java b/src/com/android/settings/datetime/timezone/TimeZoneSettings.java index a20cdb5d41e..6f776c984a1 100644 --- a/src/com/android/settings/datetime/timezone/TimeZoneSettings.java +++ b/src/com/android/settings/datetime/timezone/TimeZoneSettings.java @@ -18,6 +18,7 @@ package com.android.settings.datetime.timezone; import android.app.Activity; import android.app.AlarmManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; @@ -31,7 +32,6 @@ import android.view.MenuItem; import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceCategory; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settings.dashboard.DashboardFragment; @@ -75,7 +75,7 @@ public class TimeZoneSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.ZONE_PICKER; + return SettingsEnums.ZONE_PICKER; } @Override diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java index 221afb09142..0bc9dc9f04a 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java @@ -16,6 +16,7 @@ package com.android.settings.deletionhelper; +import android.app.settings.SettingsEnums; import android.content.ContentResolver; import android.content.Context; import android.os.Bundle; @@ -28,7 +29,6 @@ import androidx.preference.DropDownPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.Utils; @@ -138,7 +138,7 @@ public class AutomaticStorageManagerSettings extends DashboardFragment @Override public int getMetricsCategory() { - return MetricsEvent.STORAGE_MANAGER_SETTINGS; + return SettingsEnums.STORAGE_MANAGER_SETTINGS; } @Override diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java index eab19bed38a..c54d7893a9e 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java @@ -16,6 +16,7 @@ package com.android.settings.deletionhelper; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; @@ -24,7 +25,6 @@ import android.widget.Switch; import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.Preconditions; import com.android.settings.widget.SwitchBar; import com.android.settingslib.Utils; @@ -64,7 +64,7 @@ public class AutomaticStorageManagerSwitchBarController @Override public void onSwitchChanged(Switch switchView, boolean isChecked) { - mMetrics.action(mContext, MetricsEvent.ACTION_TOGGLE_STORAGE_MANAGER, isChecked); + mMetrics.action(mContext, SettingsEnums.ACTION_TOGGLE_STORAGE_MANAGER, isChecked); mDaysToRetainPreference.setEnabled(isChecked); Settings.Secure.putInt( mContext.getContentResolver(), diff --git a/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceController.java b/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceController.java index ea47f35159f..8a61c75286a 100644 --- a/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceController.java +++ b/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceController.java @@ -19,12 +19,12 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class AllowBackgroundActivityStartsPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java b/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java index cbd77f589d0..95ef0197a40 100644 --- a/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java +++ b/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java @@ -17,6 +17,7 @@ package com.android.settings.development; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.os.Bundle; import android.os.PowerManager; @@ -24,7 +25,6 @@ import android.os.PowerManager; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentManager; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -46,7 +46,7 @@ public class BluetoothA2dpHwOffloadRebootDialog extends InstrumentedDialogFragme @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_BLUETOOTH_DISABLE_A2DP_HW_OFFLOAD; + return SettingsEnums.DIALOG_BLUETOOTH_DISABLE_A2DP_HW_OFFLOAD; } @Override diff --git a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java index 6613cfda181..b39d874432b 100644 --- a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java +++ b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java @@ -20,7 +20,6 @@ import android.content.Context; import android.debug.IAdbManager; import android.os.RemoteException; import android.os.ServiceManager; -import android.os.SystemProperties; import android.os.UserManager; import android.sysprop.AdbProperties; import android.text.TextUtils; diff --git a/src/com/android/settings/development/ClearAdbKeysWarningDialog.java b/src/com/android/settings/development/ClearAdbKeysWarningDialog.java index ce7e1499763..cdf8a95fdc2 100644 --- a/src/com/android/settings/development/ClearAdbKeysWarningDialog.java +++ b/src/com/android/settings/development/ClearAdbKeysWarningDialog.java @@ -17,6 +17,7 @@ package com.android.settings.development; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.os.Bundle; @@ -24,7 +25,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -45,7 +45,7 @@ public class ClearAdbKeysWarningDialog extends InstrumentedDialogFragment implem @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_CLEAR_ADB_KEYS; + return SettingsEnums.DIALOG_CLEAR_ADB_KEYS; } @Override diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index b1e118a9345..ed6a19f5c58 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -17,6 +17,7 @@ package com.android.settings.development; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.bluetooth.BluetoothA2dp; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothCodecStatus; @@ -37,7 +38,6 @@ import android.widget.Switch; import androidx.annotation.VisibleForTesting; import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.Utils; @@ -207,7 +207,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DEVELOPMENT; + return SettingsEnums.DEVELOPMENT; } @Override diff --git a/src/com/android/settings/development/DisableDevSettingsDialogFragment.java b/src/com/android/settings/development/DisableDevSettingsDialogFragment.java index 9b3ba588256..803030eb83d 100644 --- a/src/com/android/settings/development/DisableDevSettingsDialogFragment.java +++ b/src/com/android/settings/development/DisableDevSettingsDialogFragment.java @@ -17,17 +17,17 @@ package com.android.settings.development; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.os.Bundle; import android.os.PowerManager; import android.util.Log; -import androidx.annotation.VisibleForTesting; -import androidx.fragment.app.Fragment; +import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -51,7 +51,7 @@ public class DisableDevSettingsDialogFragment extends InstrumentedDialogFragment @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_DISABLE_DEVELOPMENT_OPTIONS; + return SettingsEnums.DIALOG_DISABLE_DEVELOPMENT_OPTIONS; } @Override diff --git a/src/com/android/settings/development/DisableLogPersistWarningDialog.java b/src/com/android/settings/development/DisableLogPersistWarningDialog.java index a2192c1f511..76035cca06b 100644 --- a/src/com/android/settings/development/DisableLogPersistWarningDialog.java +++ b/src/com/android/settings/development/DisableLogPersistWarningDialog.java @@ -17,6 +17,7 @@ package com.android.settings.development; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.os.Bundle; @@ -24,7 +25,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -49,7 +49,7 @@ public class DisableLogPersistWarningDialog extends InstrumentedDialogFragment i @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_LOG_PERSIST; + return SettingsEnums.DIALOG_LOG_PERSIST; } @Override diff --git a/src/com/android/settings/development/EnableAdbWarningDialog.java b/src/com/android/settings/development/EnableAdbWarningDialog.java index 3eff3f84bfb..1fcd350f1fb 100644 --- a/src/com/android/settings/development/EnableAdbWarningDialog.java +++ b/src/com/android/settings/development/EnableAdbWarningDialog.java @@ -17,6 +17,7 @@ package com.android.settings.development; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.os.Bundle; @@ -24,7 +25,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -44,7 +44,7 @@ public class EnableAdbWarningDialog extends InstrumentedDialogFragment implement @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_ENABLE_ADB; + return SettingsEnums.DIALOG_ENABLE_ADB; } @Override diff --git a/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java b/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java index 5d102eb6b40..983f55ed631 100644 --- a/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java +++ b/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java @@ -17,13 +17,13 @@ package com.android.settings.development; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.os.Bundle; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentManager; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -45,7 +45,7 @@ public class EnableDevelopmentSettingWarningDialog extends InstrumentedDialogFra @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_ENABLE_DEVELOPMENT_OPTIONS; + return SettingsEnums.DIALOG_ENABLE_DEVELOPMENT_OPTIONS; } @Override diff --git a/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java b/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java index 6324ada8861..9bfe9d2e723 100644 --- a/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java +++ b/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java @@ -17,6 +17,7 @@ package com.android.settings.development; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.os.Bundle; @@ -24,7 +25,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -45,7 +45,7 @@ public class EnableOemUnlockSettingWarningDialog extends InstrumentedDialogFragm @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_ENABLE_OEM_UNLOCKING; + return SettingsEnums.DIALOG_ENABLE_OEM_UNLOCKING; } @Override diff --git a/src/com/android/settings/development/ForceMSAAPreferenceController.java b/src/com/android/settings/development/ForceMSAAPreferenceController.java index ce539c79395..a1a4d66317b 100644 --- a/src/com/android/settings/development/ForceMSAAPreferenceController.java +++ b/src/com/android/settings/development/ForceMSAAPreferenceController.java @@ -19,7 +19,6 @@ package com.android.settings.development; import android.content.Context; import android.sysprop.DisplayProperties; -import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; diff --git a/src/com/android/settings/development/MockLocationAppPreferenceController.java b/src/com/android/settings/development/MockLocationAppPreferenceController.java index 0d8c07a8456..45d6be8c682 100644 --- a/src/com/android/settings/development/MockLocationAppPreferenceController.java +++ b/src/com/android/settings/development/MockLocationAppPreferenceController.java @@ -16,8 +16,7 @@ package com.android.settings.development; -import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes - .REQUEST_MOCK_LOCATION_APP; +import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_MOCK_LOCATION_APP; import android.Manifest; import android.app.Activity; diff --git a/src/com/android/settings/development/OemLockInfoDialog.java b/src/com/android/settings/development/OemLockInfoDialog.java index 3136ec1519c..c540daae685 100644 --- a/src/com/android/settings/development/OemLockInfoDialog.java +++ b/src/com/android/settings/development/OemLockInfoDialog.java @@ -17,13 +17,13 @@ package com.android.settings.development; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.os.Bundle; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -41,7 +41,7 @@ public class OemLockInfoDialog extends InstrumentedDialogFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_OEM_LOCK_INFO; + return SettingsEnums.DIALOG_OEM_LOCK_INFO; } @Override diff --git a/src/com/android/settings/development/OemUnlockPreferenceController.java b/src/com/android/settings/development/OemUnlockPreferenceController.java index cadb0bcfd6b..b6b4d1765e2 100644 --- a/src/com/android/settings/development/OemUnlockPreferenceController.java +++ b/src/com/android/settings/development/OemUnlockPreferenceController.java @@ -16,8 +16,7 @@ package com.android.settings.development; -import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes - .REQUEST_CODE_ENABLE_OEM_UNLOCK; +import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_ENABLE_OEM_UNLOCK; import android.app.Activity; import android.content.Context; diff --git a/src/com/android/settings/development/OverlayCategoryPreferenceController.java b/src/com/android/settings/development/OverlayCategoryPreferenceController.java index 276049f2a50..9db8a2fc39b 100644 --- a/src/com/android/settings/development/OverlayCategoryPreferenceController.java +++ b/src/com/android/settings/development/OverlayCategoryPreferenceController.java @@ -26,6 +26,11 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -34,11 +39,6 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * Preference controller to allow users to choose an overlay from a list for a given category. * The chosen overlay is enabled exclusively within its category. A default option is also diff --git a/src/com/android/settings/development/SelectDebugAppPreferenceController.java b/src/com/android/settings/development/SelectDebugAppPreferenceController.java index ce6c7c4644e..b882c70c613 100644 --- a/src/com/android/settings/development/SelectDebugAppPreferenceController.java +++ b/src/com/android/settings/development/SelectDebugAppPreferenceController.java @@ -16,8 +16,7 @@ package com.android.settings.development; -import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes - .REQUEST_CODE_DEBUG_APP; +import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_DEBUG_APP; import android.app.Activity; import android.content.Context; diff --git a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java index 18551bf9d50..f78a2970c13 100644 --- a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java +++ b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.development; import android.content.Context; import android.sysprop.DisplayProperties; -import android.view.View; import androidx.preference.Preference; import androidx.preference.SwitchPreference; diff --git a/src/com/android/settings/development/SmsAccessRestrictionPreferenceController.java b/src/com/android/settings/development/SmsAccessRestrictionPreferenceController.java index b3f7b23860b..6091614dbe2 100644 --- a/src/com/android/settings/development/SmsAccessRestrictionPreferenceController.java +++ b/src/com/android/settings/development/SmsAccessRestrictionPreferenceController.java @@ -19,12 +19,12 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + // STOPSHIP b/118694572: remove the kill switch once the feature is tested and stable public class SmsAccessRestrictionPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java index d11fe37c66a..80cb2250025 100644 --- a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java +++ b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java @@ -16,8 +16,7 @@ package com.android.settings.development; -import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes - .REQUEST_CODE_DEBUG_APP; +import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_DEBUG_APP; import android.app.Activity; import android.app.ActivityManager; diff --git a/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java b/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java index 33de9c3dbee..941c94cfbe4 100644 --- a/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java +++ b/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java @@ -23,8 +23,6 @@ import android.util.FeatureFlagUtils; import androidx.annotation.VisibleForTesting; -import androidx.annotation.VisibleForTesting; - import com.android.settings.core.FeatureFlags; import java.util.HashSet; diff --git a/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java b/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java index 0307727858a..613fb17e391 100644 --- a/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java +++ b/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java @@ -16,10 +16,10 @@ package com.android.settings.development.featureflags; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -39,7 +39,7 @@ public class FeatureFlagsDashboard extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_FEATURE_FLAGS_DASHBOARD; + return SettingsEnums.SETTINGS_FEATURE_FLAGS_DASHBOARD; } @Override diff --git a/src/com/android/settings/development/gup/GupDashboard.java b/src/com/android/settings/development/gup/GupDashboard.java index 31f01dd08eb..0ab57e677d8 100644 --- a/src/com/android/settings/development/gup/GupDashboard.java +++ b/src/com/android/settings/development/gup/GupDashboard.java @@ -16,16 +16,14 @@ package com.android.settings.development.gup; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; -import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.development.DevelopmentSettingsEnabler; import com.android.settingslib.search.SearchIndexable; @@ -38,7 +36,7 @@ public class GupDashboard extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_GUP_DASHBOARD; + return SettingsEnums.SETTINGS_GUP_DASHBOARD; } @Override diff --git a/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java b/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java index 795d26ca9f6..c6f0ecd3ae9 100644 --- a/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java +++ b/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java @@ -16,10 +16,10 @@ package com.android.settings.development.qstile; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -46,7 +46,7 @@ public class DevelopmentTileConfigFragment extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DEVELOPMENT_QS_TILE_CONFIG; + return SettingsEnums.DEVELOPMENT_QS_TILE_CONFIG; } public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = diff --git a/src/com/android/settings/development/qstile/DevelopmentTiles.java b/src/com/android/settings/development/qstile/DevelopmentTiles.java index 849ed2fa85c..5edbc7031ff 100644 --- a/src/com/android/settings/development/qstile/DevelopmentTiles.java +++ b/src/com/android/settings/development/qstile/DevelopmentTiles.java @@ -31,7 +31,6 @@ import android.sysprop.DisplayProperties; import android.util.Log; import android.view.IWindowManager; import android.view.ThreadedRenderer; -import android.view.View; import android.view.WindowManagerGlobal; import android.widget.Toast; diff --git a/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java b/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java index 5d07f2c238c..b54b3980686 100644 --- a/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java +++ b/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java @@ -17,13 +17,13 @@ package com.android.settings.deviceinfo; import android.accounts.Account; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.accounts.AccountDetailDashboardFragment; import com.android.settings.accounts.AccountFeatureProvider; @@ -75,7 +75,7 @@ public class BrandedAccountPreferenceController extends BasePreferenceController .setDestination(AccountDetailDashboardFragment.class.getName()) .setTitleRes(R.string.account_sync_title) .setArguments(args) - .setSourceMetricsCategory(MetricsEvent.DEVICEINFO) + .setSourceMetricsCategory(SettingsEnums.DEVICEINFO) .launch(); return true; }); diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java index 5883e2173d5..ec0ab36d270 100644 --- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java +++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.deviceinfo; import static android.content.Context.CLIPBOARD_SERVICE; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.ClipData; import android.content.ClipboardManager; import android.content.ComponentName; @@ -130,14 +131,14 @@ public class BuildNumberPreferenceController extends BasePreferenceController im // Don't enable developer options for secondary non-demo users. if (!(mUm.isAdminUser() || mUm.isDemoUser())) { mMetricsFeatureProvider.action( - mContext, MetricsEvent.ACTION_SETTINGS_BUILD_NUMBER_PREF); + mContext, SettingsEnums.ACTION_SETTINGS_BUILD_NUMBER_PREF); return false; } // Don't enable developer options until device has been provisioned if (!Utils.isDeviceProvisioned(mContext)) { mMetricsFeatureProvider.action( - mContext, MetricsEvent.ACTION_SETTINGS_BUILD_NUMBER_PREF); + mContext, SettingsEnums.ACTION_SETTINGS_BUILD_NUMBER_PREF); return false; } @@ -163,7 +164,7 @@ public class BuildNumberPreferenceController extends BasePreferenceController im mDebuggingFeaturesDisallowedAdmin); } mMetricsFeatureProvider.action( - mContext, MetricsEvent.ACTION_SETTINGS_BUILD_NUMBER_PREF); + mContext, SettingsEnums.ACTION_SETTINGS_BUILD_NUMBER_PREF); return false; } diff --git a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java index a9d0e3fe352..2797153457e 100644 --- a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java +++ b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java @@ -28,7 +28,6 @@ import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.DeviceInfoUtils; -import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; diff --git a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java index fef034267cd..34a714393dd 100644 --- a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java +++ b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.os.Build; import android.os.Bundle; import android.os.SystemProperties; @@ -28,7 +29,6 @@ import android.widget.TextView; import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -38,7 +38,7 @@ public class HardwareInfoDialogFragment extends InstrumentedDialogFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_SETTINGS_HARDWARE_INFO; + return SettingsEnums.DIALOG_SETTINGS_HARDWARE_INFO; } public static HardwareInfoDialogFragment newInstance() { diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java index 41f8650ed34..bd0772c668d 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; @@ -34,7 +35,6 @@ import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -48,7 +48,7 @@ public class PrivateVolumeForget extends InstrumentedFragment { @Override public int getMetricsCategory() { - return MetricsEvent.DEVICEINFO_STORAGE; + return SettingsEnums.DEVICEINFO_STORAGE; } @Override @@ -97,7 +97,7 @@ public class PrivateVolumeForget extends InstrumentedFragment { @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_VOLUME_FORGET; + return SettingsEnums.DIALOG_VOLUME_FORGET; } public static void show(Fragment parent, String fsUuid) { diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java b/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java index 83b55f82577..dadff3c1dbb 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java @@ -21,6 +21,7 @@ import static android.os.storage.DiskInfo.EXTRA_DISK_ID; import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_FORGET_UUID; import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_PRIVATE; +import android.app.settings.SettingsEnums; import android.content.Intent; import android.os.Bundle; import android.os.storage.DiskInfo; @@ -34,7 +35,6 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.InstrumentedFragment; @@ -44,7 +44,7 @@ public class PrivateVolumeFormat extends InstrumentedFragment { @Override public int getMetricsCategory() { - return MetricsEvent.DEVICEINFO_STORAGE; + return SettingsEnums.DEVICEINFO_STORAGE; } @Override diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java index f51692632c2..e68f851480a 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -52,7 +53,6 @@ import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Settings.StorageUseActivity; import com.android.settings.SettingsPreferenceFragment; @@ -140,7 +140,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { @Override public int getMetricsCategory() { - return MetricsEvent.DEVICEINFO_STORAGE; + return SettingsEnums.DEVICEINFO_STORAGE; } @Override @@ -707,7 +707,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_VOLUME_RENAME; + return SettingsEnums.DIALOG_VOLUME_RENAME; } @Override @@ -755,7 +755,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_STORAGE_SYSTEM_INFO; + return SettingsEnums.DIALOG_STORAGE_SYSTEM_INFO; } @Override @@ -786,7 +786,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_STORAGE_OTHER_INFO; + return SettingsEnums.DIALOG_STORAGE_OTHER_INFO; } @Override @@ -828,7 +828,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_STORAGE_USER_INFO; + return SettingsEnums.DIALOG_STORAGE_USER_INFO; } @Override @@ -862,7 +862,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_STORAGE_CLEAR_CACHE; + return SettingsEnums.DIALOG_STORAGE_CLEAR_CACHE; } @Override diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java b/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java index e74abc92950..3289df9ae3b 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java @@ -16,6 +16,7 @@ package com.android.settings.deviceinfo; +import android.app.settings.SettingsEnums; import android.os.Bundle; import android.os.storage.DiskInfo; import android.os.storage.StorageManager; @@ -28,7 +29,6 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.InstrumentedFragment; import com.android.settings.deviceinfo.StorageSettings.UnmountTask; @@ -40,7 +40,7 @@ public class PrivateVolumeUnmount extends InstrumentedFragment { @Override public int getMetricsCategory() { - return MetricsEvent.DEVICEINFO_STORAGE; + return SettingsEnums.DEVICEINFO_STORAGE; } @Override diff --git a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java index 84769744839..fc74ab8c214 100644 --- a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import android.app.ActivityManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.res.Resources; import android.net.Uri; @@ -38,7 +39,6 @@ import android.widget.Button; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.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 public int getMetricsCategory() { - return MetricsEvent.DEVICEINFO_STORAGE; + return SettingsEnums.DEVICEINFO_STORAGE; } @Override diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java index 8fb3ef18ff3..c9cec578df1 100644 --- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java +++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.app.usage.StorageStatsManager; import android.content.Context; import android.graphics.drawable.Drawable; @@ -33,7 +34,6 @@ import androidx.annotation.VisibleForTesting; import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.dashboard.DashboardFragment; @@ -169,7 +169,7 @@ public class StorageDashboardFragment extends DashboardFragment @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_STORAGE_CATEGORY; + return SettingsEnums.SETTINGS_STORAGE_CATEGORY; } @Override diff --git a/src/com/android/settings/deviceinfo/StorageProfileFragment.java b/src/com/android/settings/deviceinfo/StorageProfileFragment.java index 2a865bf2f07..360265cfbbd 100644 --- a/src/com/android/settings/deviceinfo/StorageProfileFragment.java +++ b/src/com/android/settings/deviceinfo/StorageProfileFragment.java @@ -16,6 +16,7 @@ package com.android.settings.deviceinfo; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.os.UserHandle; @@ -28,7 +29,6 @@ import androidx.annotation.VisibleForTesting; import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.dashboard.DashboardFragment; @@ -83,7 +83,7 @@ public class StorageProfileFragment extends DashboardFragment @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_STORAGE_PROFILE; + return SettingsEnums.SETTINGS_STORAGE_PROFILE; } @Override diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java index b32da9d436b..2e52e6b4642 100644 --- a/src/com/android/settings/deviceinfo/StorageSettings.java +++ b/src/com/android/settings/deviceinfo/StorageSettings.java @@ -19,6 +19,7 @@ package com.android.settings.deviceinfo; import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -46,7 +47,6 @@ import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.core.SubSettingLauncher; @@ -74,7 +74,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index private static final String TAG_VOLUME_UNMOUNTED = "volume_unmounted"; private static final String TAG_DISK_INIT = "disk_init"; - private static final int METRICS_CATEGORY = MetricsEvent.DEVICEINFO_STORAGE; + private static final int METRICS_CATEGORY = SettingsEnums.DEVICEINFO_STORAGE; static final int COLOR_PUBLIC = Color.parseColor("#ff9e9e9e"); @@ -447,7 +447,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_VOLUME_UNMOUNT; + return SettingsEnums.DIALOG_VOLUME_UNMOUNT; } @Override @@ -513,7 +513,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index public static class DiskInitFragment extends InstrumentedDialogFragment { @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_VOLUME_INIT; + return SettingsEnums.DIALOG_VOLUME_INIT; } public static void show(Fragment parent, int resId, String diskId) { diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java index 5e3c86e1add..9c18a0da608 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java +++ b/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java @@ -22,6 +22,7 @@ import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_FOR import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_PRIVATE; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -32,7 +33,6 @@ import android.text.TextUtils; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentActivity; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -65,7 +65,7 @@ public class StorageWizardFormatConfirm extends InstrumentedDialogFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_VOLUME_FORMAT; + return SettingsEnums.DIALOG_VOLUME_FORMAT; } @Override diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatSlow.java b/src/com/android/settings/deviceinfo/StorageWizardFormatSlow.java index f1ac1c24997..79f97de8514 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardFormatSlow.java +++ b/src/com/android/settings/deviceinfo/StorageWizardFormatSlow.java @@ -16,6 +16,7 @@ package com.android.settings.deviceinfo; +import android.app.settings.SettingsEnums; import android.content.Intent; import android.os.Bundle; import android.os.storage.DiskInfo; @@ -23,7 +24,6 @@ import android.os.storage.VolumeInfo; import android.text.TextUtils; import android.view.View; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; @@ -58,7 +58,7 @@ public class StorageWizardFormatSlow extends StorageWizardBase { @Override public void onNavigateBack(View view) { FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this, - MetricsEvent.ACTION_STORAGE_BENCHMARK_SLOW_ABORT); + SettingsEnums.ACTION_STORAGE_BENCHMARK_SLOW_ABORT); final Intent intent = new Intent(this, StorageWizardInit.class); startActivity(intent); @@ -70,11 +70,11 @@ public class StorageWizardFormatSlow extends StorageWizardBase { if (view != null) { // User made an explicit choice to continue when slow FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this, - MetricsEvent.ACTION_STORAGE_BENCHMARK_SLOW_CONTINUE); + SettingsEnums.ACTION_STORAGE_BENCHMARK_SLOW_CONTINUE); } else { // User made an implicit choice to continue when fast FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this, - MetricsEvent.ACTION_STORAGE_BENCHMARK_FAST_CONTINUE); + SettingsEnums.ACTION_STORAGE_BENCHMARK_FAST_CONTINUE); } final String forgetUuid = getIntent().getStringExtra(EXTRA_FORMAT_FORGET_UUID); diff --git a/src/com/android/settings/deviceinfo/StorageWizardInit.java b/src/com/android/settings/deviceinfo/StorageWizardInit.java index 907f58c6160..4f9c5e7aba0 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardInit.java +++ b/src/com/android/settings/deviceinfo/StorageWizardInit.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import android.app.ActivityManager; +import android.app.settings.SettingsEnums; import android.content.Intent; import android.os.Bundle; import android.os.UserManager; @@ -25,7 +26,6 @@ import android.os.storage.VolumeInfo; import android.view.View; import android.widget.Button; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; @@ -72,7 +72,7 @@ public class StorageWizardInit extends StorageWizardBase { if (view != null) { // User made an explicit choice for external FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this, - MetricsEvent.ACTION_STORAGE_INIT_EXTERNAL); + SettingsEnums.ACTION_STORAGE_INIT_EXTERNAL); } if (mVolume != null && mVolume.getType() == VolumeInfo.TYPE_PUBLIC @@ -95,7 +95,7 @@ public class StorageWizardInit extends StorageWizardBase { if (view != null) { // User made an explicit choice for internal FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this, - MetricsEvent.ACTION_STORAGE_INIT_INTERNAL); + SettingsEnums.ACTION_STORAGE_INIT_INTERNAL); } StorageWizardFormatConfirm.showPrivate(this, mDisk.getId()); diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java index 48ec0e313d0..1cae22eca90 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java +++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java @@ -18,6 +18,7 @@ package com.android.settings.deviceinfo; import static com.android.settings.deviceinfo.StorageSettings.TAG; +import android.app.settings.SettingsEnums; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.UserInfo; @@ -31,7 +32,6 @@ import android.util.Log; import android.view.View; import android.widget.Toast; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; import com.android.settings.password.ChooseLockSettingsHelper; @@ -83,7 +83,7 @@ public class StorageWizardMigrateConfirm extends StorageWizardBase { @Override public void onNavigateBack(View view) { FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this, - MetricsEvent.ACTION_STORAGE_MIGRATE_LATER); + SettingsEnums.ACTION_STORAGE_MIGRATE_LATER); if (mDisk != null) { final Intent intent = new Intent(this, StorageWizardReady.class); @@ -137,7 +137,7 @@ public class StorageWizardMigrateConfirm extends StorageWizardBase { } FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this, - MetricsEvent.ACTION_STORAGE_MIGRATE_NOW); + SettingsEnums.ACTION_STORAGE_MIGRATE_NOW); final Intent intent = new Intent(this, StorageWizardMigrateProgress.class); intent.putExtra(VolumeInfo.EXTRA_VOLUME_ID, mVolume.getId()); diff --git a/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialog.java b/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialog.java index a6b1dec8e6e..b38f13ff36c 100644 --- a/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialog.java +++ b/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialog.java @@ -17,13 +17,13 @@ package com.android.settings.deviceinfo.aboutphone; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.os.Bundle; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentManager; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -48,7 +48,7 @@ public class DeviceNameWarningDialog extends InstrumentedDialogFragment @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_ENABLE_DEVELOPMENT_OPTIONS; + return SettingsEnums.DIALOG_ENABLE_DEVELOPMENT_OPTIONS; } @Override diff --git a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java index e836d1fe7b4..b61cb3c0ade 100644 --- a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java +++ b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo.aboutphone; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.pm.UserInfo; @@ -25,7 +26,6 @@ import android.os.UserManager; import android.provider.SearchIndexableResource; import android.view.View; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.accounts.EmergencyInfoPreferenceController; @@ -68,7 +68,7 @@ public class MyDeviceInfoFragment extends DashboardFragment @Override public int getMetricsCategory() { - return MetricsEvent.DEVICEINFO; + return SettingsEnums.DEVICEINFO; } @Override diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java index 5dbc5ac5744..f615968386b 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo.firmwareversion; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -26,7 +27,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -46,7 +46,7 @@ public class FirmwareVersionDialogFragment extends InstrumentedDialogFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_FIRMWARE_VERSION; + return SettingsEnums.DIALOG_FIRMWARE_VERSION; } @Override diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java index 5347fa7813c..b2f083f001d 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo.imei; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.os.Bundle; import android.text.TextUtils; import android.view.LayoutInflater; @@ -29,7 +30,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -57,7 +57,7 @@ public class ImeiInfoDialogFragment extends InstrumentedDialogFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_IMEI_INFO; + return SettingsEnums.DIALOG_IMEI_INFO; } @Override diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java index e7e9fa4a18c..af0bf5a0c19 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java @@ -25,7 +25,6 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.content.pm.PackageManager; import android.content.res.Resources; import android.os.Bundle; import android.os.PersistableBundle; @@ -42,18 +41,17 @@ import android.telephony.euicc.EuiccManager; import android.text.BidiFormatter; import android.text.TextDirectionHeuristics; import android.text.TextUtils; -import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; import com.android.settings.R; import com.android.settingslib.DeviceInfoUtils; +import com.android.settingslib.Utils; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import com.android.settingslib.Utils; import java.util.List; diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java index ca1c6efa5a5..d2d563f3b80 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo.simstatus; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.os.Bundle; import android.text.TextUtils; import android.view.LayoutInflater; @@ -27,7 +28,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -43,7 +43,7 @@ public class SimStatusDialogFragment extends InstrumentedDialogFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_SIM_STATUS; + return SettingsEnums.DIALOG_SIM_STATUS; } public static void show(Fragment host, int slotId, String dialogTitle) { diff --git a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java index a9c98d5714a..95c02fd884f 100644 --- a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo.storage; import android.app.ActivityManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; @@ -25,7 +26,6 @@ import androidx.annotation.VisibleForTesting; import androidx.fragment.app.FragmentManager; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.BasePreferenceController; import com.android.settings.deletionhelper.ActivationWarningFragment; import com.android.settings.overlay.FeatureFactory; @@ -86,7 +86,7 @@ public class AutomaticStorageManagementSwitchPreferenceController extends @Override public boolean onSwitchToggled(boolean isChecked) { mMetricsFeatureProvider.action(mContext, - MetricsEvent.ACTION_TOGGLE_STORAGE_MANAGER, isChecked); + SettingsEnums.ACTION_TOGGLE_STORAGE_MANAGER, isChecked); Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, isChecked ? 1 : 0); diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java index c63fe10fbfd..4bc7cde9d70 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.deviceinfo.storage; +import android.app.settings.SettingsEnums; import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; @@ -33,7 +34,6 @@ import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Settings; import com.android.settings.applications.manageapplications.ManageApplications; @@ -155,7 +155,7 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle case FILES_KEY: intent = getFilesIntent(); FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().action( - mContext, MetricsEvent.STORAGE_FILES); + mContext, SettingsEnums.STORAGE_FILES); break; case SYSTEM_KEY: final SystemInfoFragment dialog = new SystemInfoFragment(); diff --git a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java index a025d8c4daf..cf505960260 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java +++ b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java @@ -16,6 +16,7 @@ package com.android.settings.deviceinfo.storage; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.graphics.Typeface; @@ -29,7 +30,6 @@ import android.widget.Button; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; import com.android.settings.widget.DonutView; @@ -81,7 +81,7 @@ public class StorageSummaryDonutPreference extends Preference implements View.On if (v != null && R.id.deletion_helper_button == v.getId()) { Context context = getContext(); FeatureFactory.getFactory(context).getMetricsFeatureProvider().action( - context, MetricsEvent.STORAGE_FREE_UP_SPACE_NOW); + context, SettingsEnums.STORAGE_FREE_UP_SPACE_NOW); Intent intent = new Intent(StorageManager.ACTION_MANAGE_STORAGE); getContext().startActivity(intent); } diff --git a/src/com/android/settings/deviceinfo/storage/UserProfileController.java b/src/com/android/settings/deviceinfo/storage/UserProfileController.java index 887b1a7e95f..a2e19db235e 100644 --- a/src/com/android/settings/deviceinfo/storage/UserProfileController.java +++ b/src/com/android/settings/deviceinfo/storage/UserProfileController.java @@ -16,6 +16,7 @@ package com.android.settings.deviceinfo.storage; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; @@ -26,7 +27,6 @@ import android.util.SparseArray; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto; import com.android.internal.util.Preconditions; import com.android.settings.Utils; import com.android.settings.core.PreferenceControllerMixin; @@ -84,7 +84,7 @@ public class UserProfileController extends AbstractPreferenceController implemen .setDestination(StorageProfileFragment.class.getName()) .setArguments(args) .setTitleText(mUser.name) - .setSourceMetricsCategory(MetricsProto.MetricsEvent.DEVICEINFO_STORAGE) + .setSourceMetricsCategory(SettingsEnums.DEVICEINFO_STORAGE) .launch(); return true; } diff --git a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java index f845331f96e..5c19ca7f732 100644 --- a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java +++ b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java @@ -15,8 +15,7 @@ package com.android.settings.display; import static android.provider.Settings.Secure.DOZE_ENABLED; -import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_AMBIENT_DISPLAY; - +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.UserHandle; import android.provider.Settings; @@ -62,7 +61,7 @@ public class AmbientDisplayNotificationsPreferenceController extends @Override public boolean handlePreferenceTreeClick(Preference preference) { if (KEY_AMBIENT_DISPLAY_NOTIFICATIONS.equals(preference.getKey())) { - mMetricsFeatureProvider.action(mContext, ACTION_AMBIENT_DISPLAY); + mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_AMBIENT_DISPLAY); } return false; } diff --git a/src/com/android/settings/display/AutoBrightnessSettings.java b/src/com/android/settings/display/AutoBrightnessSettings.java index 39877ec5dde..b0ab6b0f122 100644 --- a/src/com/android/settings/display/AutoBrightnessSettings.java +++ b/src/com/android/settings/display/AutoBrightnessSettings.java @@ -16,11 +16,11 @@ package com.android.settings.display; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -53,7 +53,7 @@ public class AutoBrightnessSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_AUTO_BRIGHTNESS; + return SettingsEnums.SETTINGS_AUTO_BRIGHTNESS; } @Override diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java index c852c01f380..f444d8ad61d 100644 --- a/src/com/android/settings/display/AutoRotatePreferenceController.java +++ b/src/com/android/settings/display/AutoRotatePreferenceController.java @@ -13,12 +13,12 @@ */ package com.android.settings.display; +import android.app.settings.SettingsEnums; import android.content.Context; import android.text.TextUtils; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto; import com.android.internal.view.RotationPolicy; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.TogglePreferenceController; @@ -89,7 +89,7 @@ public class AutoRotatePreferenceController extends TogglePreferenceController i @Override public boolean setChecked(boolean isChecked) { final boolean isLocked = !isChecked; - mMetricsFeatureProvider.action(mContext, MetricsProto.MetricsEvent.ACTION_ROTATION_LOCK, + mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ROTATION_LOCK, isLocked); RotationPolicy.setRotationLock(mContext, isLocked); return true; diff --git a/src/com/android/settings/display/ColorModePreferenceFragment.java b/src/com/android/settings/display/ColorModePreferenceFragment.java index 2a21379c4bf..e8fc1c5c747 100644 --- a/src/com/android/settings/display/ColorModePreferenceFragment.java +++ b/src/com/android/settings/display/ColorModePreferenceFragment.java @@ -13,6 +13,7 @@ */ package com.android.settings.display; +import android.app.settings.SettingsEnums; import android.content.Context; import android.graphics.drawable.Drawable; import android.provider.SearchIndexableResource; @@ -21,7 +22,6 @@ import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceScreen; import com.android.internal.app.ColorDisplayController; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -149,7 +149,7 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.COLOR_MODE_SETTINGS; + return SettingsEnums.COLOR_MODE_SETTINGS; } @VisibleForTesting diff --git a/src/com/android/settings/display/DisplayWhiteBalancePreferenceController.java b/src/com/android/settings/display/DisplayWhiteBalancePreferenceController.java index dc8636a435f..bf2b347a22f 100644 --- a/src/com/android/settings/display/DisplayWhiteBalancePreferenceController.java +++ b/src/com/android/settings/display/DisplayWhiteBalancePreferenceController.java @@ -17,6 +17,7 @@ import android.content.Context; import android.hardware.display.ColorDisplayManager; import android.os.UserHandle; import android.provider.Settings.Secure; + import com.android.internal.app.ColorDisplayController; import com.android.settings.core.TogglePreferenceController; diff --git a/src/com/android/settings/display/FontSizePreferenceFragmentForSetupWizard.java b/src/com/android/settings/display/FontSizePreferenceFragmentForSetupWizard.java index 703ec9c76a0..04b6dc33f4a 100644 --- a/src/com/android/settings/display/FontSizePreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/display/FontSizePreferenceFragmentForSetupWizard.java @@ -16,21 +16,21 @@ package com.android.settings.display; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import android.app.settings.SettingsEnums; public class FontSizePreferenceFragmentForSetupWizard extends ToggleFontSizePreferenceFragment { @Override public int getMetricsCategory() { - return MetricsEvent.SUW_ACCESSIBILITY_FONT_SIZE; + return SettingsEnums.SUW_ACCESSIBILITY_FONT_SIZE; } @Override public void onStop() { // Log the final choice in value if it's different from the previous value. if (mCurrentIndex != mInitialIndex) { - mMetricsFeatureProvider.action(getContext(), MetricsEvent.SUW_ACCESSIBILITY_FONT_SIZE, + mMetricsFeatureProvider.action(getContext(), SettingsEnums.SUW_ACCESSIBILITY_FONT_SIZE, mCurrentIndex); } diff --git a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java index f7a5425f48b..2fa0ef5779c 100644 --- a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java +++ b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java @@ -17,11 +17,10 @@ package com.android.settings.display; import android.content.Context; +import android.hardware.display.ColorDisplayManager; import androidx.preference.Preference; -import android.hardware.display.ColorDisplayManager; - import com.android.internal.app.ColorDisplayController; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java b/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java index 346ddd6725a..cf740fd2ffe 100644 --- a/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java +++ b/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java @@ -17,11 +17,10 @@ package com.android.settings.display; import android.content.Context; +import android.hardware.display.ColorDisplayManager; import androidx.preference.Preference; -import android.hardware.display.ColorDisplayManager; - import com.android.internal.app.ColorDisplayController; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java index e0c12c3fcc0..194f0068593 100644 --- a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java @@ -17,11 +17,10 @@ package com.android.settings.display; import android.content.Context; +import android.hardware.display.ColorDisplayManager; import androidx.preference.Preference; -import android.hardware.display.ColorDisplayManager; - import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.widget.FooterPreference; diff --git a/src/com/android/settings/display/NightDisplayPreferenceController.java b/src/com/android/settings/display/NightDisplayPreferenceController.java index 678e4d36cfe..162a648e294 100644 --- a/src/com/android/settings/display/NightDisplayPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayPreferenceController.java @@ -14,8 +14,8 @@ package com.android.settings.display; import android.content.Context; - import android.hardware.display.ColorDisplayManager; + import com.android.internal.app.ColorDisplayController; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java index 7e7741520c8..fb81a8c1327 100644 --- a/src/com/android/settings/display/NightDisplaySettings.java +++ b/src/com/android/settings/display/NightDisplaySettings.java @@ -18,6 +18,7 @@ package com.android.settings.display; import android.app.Dialog; import android.app.TimePickerDialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.hardware.display.ColorDisplayManager; import android.os.Bundle; @@ -26,7 +27,6 @@ import android.provider.SearchIndexableResource; import androidx.preference.Preference; import com.android.internal.app.ColorDisplayController; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -116,9 +116,9 @@ public class NightDisplaySettings extends DashboardFragment public int getDialogMetricsCategory(int dialogId) { switch (dialogId) { case DIALOG_START_TIME: - return MetricsEvent.DIALOG_NIGHT_DISPLAY_SET_START_TIME; + return SettingsEnums.DIALOG_NIGHT_DISPLAY_SET_START_TIME; case DIALOG_END_TIME: - return MetricsEvent.DIALOG_NIGHT_DISPLAY_SET_END_TIME; + return SettingsEnums.DIALOG_NIGHT_DISPLAY_SET_END_TIME; default: return 0; } @@ -161,7 +161,7 @@ public class NightDisplaySettings extends DashboardFragment @Override public int getMetricsCategory() { - return MetricsEvent.NIGHT_DISPLAY_SETTINGS; + return SettingsEnums.NIGHT_DISPLAY_SETTINGS; } @Override diff --git a/src/com/android/settings/display/PreviewPagerAdapter.java b/src/com/android/settings/display/PreviewPagerAdapter.java index 4d5b47a799e..5c4368303f1 100644 --- a/src/com/android/settings/display/PreviewPagerAdapter.java +++ b/src/com/android/settings/display/PreviewPagerAdapter.java @@ -19,11 +19,9 @@ import android.animation.Animator; import android.animation.Animator.AnimatorListener; import android.content.Context; import android.content.res.Configuration; -import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.ViewStub; -import android.view.ViewStub.OnInflateListener; import android.view.animation.AccelerateInterpolator; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; @@ -32,8 +30,6 @@ import android.widget.LinearLayout; import androidx.viewpager.widget.PagerAdapter; -import com.android.settings.support.actionbar.HelpResourceProvider; - /** * A PagerAdapter used by PreviewSeekBarPreferenceFragment that for showing multiple preview screen * regarding a single setting and allowing the user to swipe across them. diff --git a/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java b/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java index e02579f7dfb..cfa7b5d4281 100644 --- a/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java @@ -16,13 +16,13 @@ package com.android.settings.display; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import android.app.settings.SettingsEnums; public class ScreenZoomPreferenceFragmentForSetupWizard extends ScreenZoomSettings { @Override public int getMetricsCategory() { - return MetricsEvent.SUW_ACCESSIBILITY_DISPLAY_SIZE; + return SettingsEnums.SUW_ACCESSIBILITY_DISPLAY_SIZE; } @Override @@ -30,7 +30,7 @@ public class ScreenZoomPreferenceFragmentForSetupWizard extends ScreenZoomSettin // Log the final choice in value if it's different from the previous value. if (mCurrentIndex != mInitialIndex) { mMetricsFeatureProvider.action( - getContext(), MetricsEvent.SUW_ACCESSIBILITY_DISPLAY_SIZE, mCurrentIndex); + getContext(), SettingsEnums.SUW_ACCESSIBILITY_DISPLAY_SIZE, mCurrentIndex); } super.onStop(); diff --git a/src/com/android/settings/display/ScreenZoomSettings.java b/src/com/android/settings/display/ScreenZoomSettings.java index 37ac0469433..ad6c68533ef 100644 --- a/src/com/android/settings/display/ScreenZoomSettings.java +++ b/src/com/android/settings/display/ScreenZoomSettings.java @@ -17,13 +17,13 @@ package com.android.settings.display; import android.annotation.Nullable; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; import android.os.Bundle; import android.view.Display; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -113,7 +113,7 @@ public class ScreenZoomSettings extends PreviewSeekBarPreferenceFragment { @Override public int getMetricsCategory() { - return MetricsEvent.DISPLAY_SCREEN_ZOOM; + return SettingsEnums.DISPLAY_SCREEN_ZOOM; } /** Index provider used to expose this fragment in search. */ diff --git a/src/com/android/settings/display/ThemePreferenceController.java b/src/com/android/settings/display/ThemePreferenceController.java index 6fc4b08bf00..1dbf87f698b 100644 --- a/src/com/android/settings/display/ThemePreferenceController.java +++ b/src/com/android/settings/display/ThemePreferenceController.java @@ -13,8 +13,8 @@ */ package com.android.settings.display; -import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_THEME; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.om.IOverlayManager; import android.content.om.OverlayInfo; @@ -70,7 +70,7 @@ public class ThemePreferenceController extends AbstractPreferenceController impl @Override public boolean handlePreferenceTreeClick(Preference preference) { if (KEY_THEME.equals(preference.getKey())) { - mMetricsFeatureProvider.action(mContext, ACTION_THEME); + mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_THEME); } return false; } diff --git a/src/com/android/settings/display/ToggleFontSizePreferenceFragment.java b/src/com/android/settings/display/ToggleFontSizePreferenceFragment.java index 4f118d5facf..49177a0b8ba 100644 --- a/src/com/android/settings/display/ToggleFontSizePreferenceFragment.java +++ b/src/com/android/settings/display/ToggleFontSizePreferenceFragment.java @@ -17,6 +17,7 @@ package com.android.settings.display; import android.annotation.Nullable; +import android.app.settings.SettingsEnums; import android.content.ContentResolver; import android.content.Context; import android.content.res.Configuration; @@ -24,7 +25,6 @@ import android.content.res.Resources; import android.os.Bundle; import android.provider.Settings; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -96,7 +96,7 @@ public class ToggleFontSizePreferenceFragment extends PreviewSeekBarPreferenceFr @Override public int getMetricsCategory() { - return MetricsEvent.ACCESSIBILITY_FONT_SIZE; + return SettingsEnums.ACCESSIBILITY_FONT_SIZE; } /** diff --git a/src/com/android/settings/display/VrDisplayPreferencePicker.java b/src/com/android/settings/display/VrDisplayPreferencePicker.java index 5f99be9388c..4612779ba5d 100644 --- a/src/com/android/settings/display/VrDisplayPreferencePicker.java +++ b/src/com/android/settings/display/VrDisplayPreferencePicker.java @@ -16,12 +16,12 @@ package com.android.settings.display; +import android.app.settings.SettingsEnums; import android.content.Context; import android.graphics.drawable.Drawable; import android.provider.Settings; import android.text.TextUtils; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settingslib.widget.CandidateInfo; @@ -40,7 +40,7 @@ public class VrDisplayPreferencePicker extends RadioButtonPickerFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.VR_DISPLAY_PREFERENCE; + return SettingsEnums.VR_DISPLAY_PREFERENCE; } @Override diff --git a/src/com/android/settings/dream/CurrentDreamPicker.java b/src/com/android/settings/dream/CurrentDreamPicker.java index d33a1d9e25f..3134e79ffdb 100644 --- a/src/com/android/settings/dream/CurrentDreamPicker.java +++ b/src/com/android/settings/dream/CurrentDreamPicker.java @@ -16,11 +16,11 @@ package com.android.settings.dream; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; import android.graphics.drawable.Drawable; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settingslib.dream.DreamBackend; @@ -50,7 +50,7 @@ public final class CurrentDreamPicker extends RadioButtonPickerFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DREAM; + return SettingsEnums.DREAM; } @Override diff --git a/src/com/android/settings/dream/DreamSettings.java b/src/com/android/settings/dream/DreamSettings.java index 32869f80690..c36970e9bcb 100644 --- a/src/com/android/settings/dream/DreamSettings.java +++ b/src/com/android/settings/dream/DreamSettings.java @@ -21,12 +21,12 @@ import static com.android.settingslib.dream.DreamBackend.NEVER; import static com.android.settingslib.dream.DreamBackend.WHILE_CHARGING; import static com.android.settingslib.dream.DreamBackend.WHILE_DOCKED; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -93,7 +93,7 @@ public class DreamSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.DREAM; + return SettingsEnums.DREAM; } @Override diff --git a/src/com/android/settings/dream/WhenToDreamPicker.java b/src/com/android/settings/dream/WhenToDreamPicker.java index 4c69b360bc0..1c5e25ebac2 100644 --- a/src/com/android/settings/dream/WhenToDreamPicker.java +++ b/src/com/android/settings/dream/WhenToDreamPicker.java @@ -16,10 +16,10 @@ package com.android.settings.dream; +import android.app.settings.SettingsEnums; import android.content.Context; import android.graphics.drawable.Drawable; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settingslib.dream.DreamBackend; @@ -47,7 +47,7 @@ public class WhenToDreamPicker extends RadioButtonPickerFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DREAM; + return SettingsEnums.DREAM; } @Override diff --git a/src/com/android/settings/enterprise/ApplicationListFragment.java b/src/com/android/settings/enterprise/ApplicationListFragment.java index 1b41f0396e2..17de9f892a2 100644 --- a/src/com/android/settings/enterprise/ApplicationListFragment.java +++ b/src/com/android/settings/enterprise/ApplicationListFragment.java @@ -17,9 +17,9 @@ package com.android.settings.enterprise; import android.Manifest; +import android.app.settings.SettingsEnums; import android.content.Context; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.dashboard.DashboardFragment; @@ -73,7 +73,7 @@ public abstract class ApplicationListFragment extends DashboardFragment @Override public int getMetricsCategory() { - return MetricsEvent.ENTERPRISE_PRIVACY_PERMISSIONS; + return SettingsEnums.ENTERPRISE_PRIVACY_PERMISSIONS; } } @@ -102,7 +102,7 @@ public abstract class ApplicationListFragment extends DashboardFragment @Override public int getMetricsCategory() { - return MetricsEvent.ENTERPRISE_PRIVACY_INSTALLED_APPS; + return SettingsEnums.ENTERPRISE_PRIVACY_INSTALLED_APPS; } @Override diff --git a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java index dab13954873..c5beb861915 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java @@ -16,10 +16,10 @@ package com.android.settings.enterprise; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.overlay.FeatureFactory; @@ -39,7 +39,7 @@ public class EnterprisePrivacySettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.ENTERPRISE_PRIVACY_SETTINGS; + return SettingsEnums.ENTERPRISE_PRIVACY_SETTINGS; } @Override diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java index 1788c333e46..67bf68786a6 100644 --- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java +++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java @@ -16,9 +16,9 @@ package com.android.settings.enterprise; +import android.app.settings.SettingsEnums; import android.content.Context; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settingslib.core.AbstractPreferenceController; @@ -34,7 +34,7 @@ public class EnterpriseSetDefaultAppsListFragment extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.ENTERPRISE_PRIVACY_DEFAULT_APPS; + return SettingsEnums.ENTERPRISE_PRIVACY_DEFAULT_APPS; } @Override diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java index 6ad50a981c8..e19cfb8256e 100644 --- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java @@ -19,6 +19,7 @@ package com.android.settings.fuelgauge; import android.annotation.UserIdInt; import android.app.Activity; import android.app.ActivityManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -32,7 +33,6 @@ import android.view.View; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; import com.android.internal.util.ArrayUtils; @@ -258,7 +258,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements @Override public int getMetricsCategory() { - return MetricsEvent.FUELGAUGE_POWER_USAGE_DETAIL; + return SettingsEnums.FUELGAUGE_POWER_USAGE_DETAIL; } @Override diff --git a/src/com/android/settings/fuelgauge/BatterySaverController.java b/src/com/android/settings/fuelgauge/BatterySaverController.java index cd32c6c3697..c4ed88bf7c1 100644 --- a/src/com/android/settings/fuelgauge/BatterySaverController.java +++ b/src/com/android/settings/fuelgauge/BatterySaverController.java @@ -22,8 +22,8 @@ import android.os.Handler; import android.os.Looper; import android.os.PowerManager; import android.provider.Settings; - import android.provider.Settings.Global; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/fuelgauge/HighPowerDetail.java b/src/com/android/settings/fuelgauge/HighPowerDetail.java index 31029735987..a7a9812d3d7 100644 --- a/src/com/android/settings/fuelgauge/HighPowerDetail.java +++ b/src/com/android/settings/fuelgauge/HighPowerDetail.java @@ -18,6 +18,7 @@ package com.android.settings.fuelgauge; import android.app.AppOpsManager; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; @@ -32,7 +33,6 @@ import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.AppInfoBase; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -62,7 +62,7 @@ public class HighPowerDetail extends InstrumentedDialogFragment implements OnCli @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_HIGH_POWER_DETAILS; + return SettingsEnums.DIALOG_HIGH_POWER_DETAILS; } @Override @@ -153,8 +153,8 @@ public class HighPowerDetail extends InstrumentedDialogFragment implements OnCli @VisibleForTesting static void logSpecialPermissionChange(boolean whitelist, String packageName, Context context) { - int logCategory = whitelist ? MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_BATTERY_DENY - : MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_BATTERY_ALLOW; + int logCategory = whitelist ? SettingsEnums.APP_SPECIAL_PERMISSION_BATTERY_DENY + : SettingsEnums.APP_SPECIAL_PERMISSION_BATTERY_ALLOW; FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context, logCategory, packageName); } diff --git a/src/com/android/settings/fuelgauge/InactiveApps.java b/src/com/android/settings/fuelgauge/InactiveApps.java index cb419ca253b..fdfcaabef9e 100644 --- a/src/com/android/settings/fuelgauge/InactiveApps.java +++ b/src/com/android/settings/fuelgauge/InactiveApps.java @@ -23,6 +23,7 @@ import static android.app.usage.UsageStatsManager.STANDBY_BUCKET_NEVER; import static android.app.usage.UsageStatsManager.STANDBY_BUCKET_RARE; import static android.app.usage.UsageStatsManager.STANDBY_BUCKET_WORKING_SET; +import android.app.settings.SettingsEnums; import android.app.usage.UsageStatsManager; import android.content.Context; import android.content.Intent; @@ -35,7 +36,6 @@ import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -58,7 +58,7 @@ public class InactiveApps extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.FUELGAUGE_INACTIVE_APPS; + return SettingsEnums.FUELGAUGE_INACTIVE_APPS; } @Override diff --git a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java index a4ae1ac98a4..669d7ed0b7f 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java +++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java @@ -15,6 +15,7 @@ package com.android.settings.fuelgauge; import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -27,7 +28,6 @@ import android.view.MenuItem; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.overlay.FeatureFactory; @@ -81,7 +81,7 @@ public class PowerUsageAdvanced extends PowerUsageBase { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.FUELGAUGE_BATTERY_HISTORY_DETAIL; + return SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL; } @Override @@ -108,7 +108,7 @@ public class PowerUsageAdvanced extends PowerUsageBase { mShowAllApps = !mShowAllApps; item.setTitle(mShowAllApps ? R.string.hide_extra_apps : R.string.show_all_apps); mMetricsFeatureProvider.action(getContext(), - MetricsProto.MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_APPS_TOGGLE, + SettingsEnums.ACTION_SETTINGS_MENU_BATTERY_APPS_TOGGLE, mShowAllApps); restartBatteryStatsLoader(BatteryUpdateType.MANUAL); return true; diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index 85aa915b73e..75db2159dab 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -18,6 +18,7 @@ package com.android.settings.fuelgauge; import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.BatteryStats; import android.os.Bundle; @@ -35,7 +36,6 @@ import androidx.loader.app.LoaderManager; import androidx.loader.app.LoaderManager.LoaderCallbacks; import androidx.loader.content.Loader; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.Utils; @@ -225,7 +225,7 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList @Override public int getMetricsCategory() { - return MetricsEvent.FUELGAUGE_POWER_USAGE_SUMMARY_V2; + return SettingsEnums.FUELGAUGE_POWER_USAGE_SUMMARY_V2; } @Override diff --git a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java index 0906a5d9258..6722b4a35aa 100644 --- a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java +++ b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java @@ -16,6 +16,7 @@ package com.android.settings.fuelgauge; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; @@ -30,7 +31,6 @@ import androidx.preference.CheckBoxPreference; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.InstrumentedPreferenceFragment; @@ -132,7 +132,7 @@ public class RestrictedAppDetails extends DashboardFragment implements @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.FUELGAUGE_RESTRICTED_APP_DETAILS; + return SettingsEnums.FUELGAUGE_RESTRICTED_APP_DETAILS; } @Override diff --git a/src/com/android/settings/fuelgauge/SmartBatterySettings.java b/src/com/android/settings/fuelgauge/SmartBatterySettings.java index 70760016e6d..5fddbac6651 100644 --- a/src/com/android/settings/fuelgauge/SmartBatterySettings.java +++ b/src/com/android/settings/fuelgauge/SmartBatterySettings.java @@ -16,11 +16,11 @@ package com.android.settings.fuelgauge; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.core.InstrumentedPreferenceFragment; @@ -48,7 +48,7 @@ public class SmartBatterySettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.FUELGAUGE_SMART_BATTERY; + return SettingsEnums.FUELGAUGE_SMART_BATTERY; } @Override diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSchedulePreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSchedulePreferenceController.java index 868c73f8f12..2cc73d1f43d 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSchedulePreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSchedulePreferenceController.java @@ -20,9 +20,11 @@ import android.content.Context; import android.os.PowerManager; import android.provider.Settings; import android.provider.Settings.Global; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java index 6c1157604e3..62539476d18 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java @@ -20,9 +20,11 @@ import android.content.Context; import android.os.PowerManager; import android.provider.Settings; import android.provider.Settings.Global; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceScreen; + import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java index bfd36f36e62..3f8716dcdc8 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java @@ -23,15 +23,19 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.text.TextUtils; import android.view.View; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.preference.PreferenceScreen; -import com.android.settings.widget.RadioButtonPickerFragment; + import com.android.settings.R; +import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.fuelgauge.BatterySaverUtils; import com.android.settingslib.widget.CandidateInfo; + import com.google.common.collect.Lists; + import java.util.List; /** diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java index 6aef9b57e72..64354687044 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java @@ -16,20 +16,17 @@ package com.android.settings.fuelgauge.batterysaver; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; -import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.search.SearchIndexable; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -47,7 +44,7 @@ public class BatterySaverSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.FUELGAUGE_BATTERY_SAVER; + return SettingsEnums.FUELGAUGE_BATTERY_SAVER; } @Override diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java index 2534d083b4c..8b572347e73 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java @@ -40,7 +40,6 @@ import android.util.Log; import androidx.annotation.GuardedBy; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto; import com.android.internal.util.ArrayUtils; import com.android.settings.R; import com.android.settings.fuelgauge.BatteryUtils; @@ -154,7 +153,7 @@ public class AnomalyDetectionJobService extends JobService { final String versionedPackage = packageName + "/" + versionCode; if (batteryUtils.shouldHideAnomaly(powerWhitelistBackend, uid, anomalyInfo)) { metricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN, - MetricsProto.MetricsEvent.ACTION_ANOMALY_IGNORED, + SettingsEnums.ACTION_ANOMALY_IGNORED, SettingsEnums.PAGE_UNKNOWN, versionedPackage, anomalyInfo.anomalyType); @@ -172,7 +171,7 @@ public class AnomalyDetectionJobService extends JobService { timeMs); } metricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN, - MetricsProto.MetricsEvent.ACTION_ANOMALY_TRIGGERED, + SettingsEnums.ACTION_ANOMALY_TRIGGERED, SettingsEnums.PAGE_UNKNOWN, versionedPackage, anomalyInfo.anomalyType); diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryDatabaseManager.java b/src/com/android/settings/fuelgauge/batterytip/BatteryDatabaseManager.java index 5fa952c4338..f75588c04c3 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryDatabaseManager.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryDatabaseManager.java @@ -19,14 +19,10 @@ package com.android.settings.fuelgauge.batterytip; import static android.database.sqlite.SQLiteDatabase.CONFLICT_IGNORE; import static android.database.sqlite.SQLiteDatabase.CONFLICT_REPLACE; -import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns - .ANOMALY_STATE; -import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns - .ANOMALY_TYPE; -import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns - .PACKAGE_NAME; -import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns - .TIME_STAMP_MS; +import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns.ANOMALY_STATE; +import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns.ANOMALY_TYPE; +import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns.PACKAGE_NAME; +import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns.TIME_STAMP_MS; import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns.UID; import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.Tables.TABLE_ACTION; import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.Tables.TABLE_ANOMALY; diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java index dc7983547c3..58038cd4bb4 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; @@ -27,7 +28,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.Utils; @@ -145,7 +145,7 @@ public class BatteryTipDialogFragment extends InstrumentedDialogFragment impleme @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.FUELGAUGE_BATTERY_TIP_DIALOG; + return SettingsEnums.FUELGAUGE_BATTERY_TIP_DIALOG; } @Override diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/BatterySaverAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/BatterySaverAction.java index 6eff47a6b4d..0a92215aea1 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/BatterySaverAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/BatterySaverAction.java @@ -16,9 +16,9 @@ package com.android.settings.fuelgauge.batterytip.actions; +import android.app.settings.SettingsEnums; import android.content.Context; -import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.fuelgauge.BatterySaverUtils; public class BatterySaverAction extends BatteryTipAction { @@ -33,6 +33,6 @@ public class BatterySaverAction extends BatteryTipAction { public void handlePositiveAction(int metricsKey) { BatterySaverUtils.setPowerSaveMode(mContext, true, /*needFirstTimeWarning*/ true); mMetricsFeatureProvider.action(mContext, - MetricsProto.MetricsEvent.ACTION_TIP_TURN_ON_BATTERY_SAVER, metricsKey); + SettingsEnums.ACTION_TIP_TURN_ON_BATTERY_SAVER, metricsKey); } } diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/OpenBatterySaverAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/OpenBatterySaverAction.java index 236413eb844..1bc2ebfe56f 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/OpenBatterySaverAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/OpenBatterySaverAction.java @@ -16,9 +16,9 @@ package com.android.settings.fuelgauge.batterytip.actions; +import android.app.settings.SettingsEnums; import android.content.Context; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.SubSettingLauncher; import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings; @@ -38,7 +38,7 @@ public class OpenBatterySaverAction extends BatteryTipAction { @Override public void handlePositiveAction(int metricsKey) { mMetricsFeatureProvider.action(mContext, - MetricsProto.MetricsEvent.ACTION_TIP_OPEN_BATTERY_SAVER_PAGE, metricsKey); + SettingsEnums.ACTION_TIP_OPEN_BATTERY_SAVER_PAGE, metricsKey); new SubSettingLauncher(mContext) .setDestination(BatterySaverSettings.class.getName()) .setSourceMetricsCategory(metricsKey) diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentAction.java index 9d35615840a..f0d9f28e8d3 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentAction.java @@ -16,9 +16,10 @@ package com.android.settings.fuelgauge.batterytip.actions; +import android.app.settings.SettingsEnums; + import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.fuelgauge.RestrictedAppDetails; import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper; @@ -52,7 +53,7 @@ public class OpenRestrictAppFragmentAction extends BatteryTipAction { @Override public void handlePositiveAction(int metricsKey) { mMetricsFeatureProvider.action(mContext, - MetricsProto.MetricsEvent.ACTION_TIP_OPEN_APP_RESTRICTION_PAGE, metricsKey); + SettingsEnums.ACTION_TIP_OPEN_APP_RESTRICTION_PAGE, metricsKey); final List mAppInfos = mRestrictAppTip.getRestrictAppList(); RestrictedAppDetails.startRestrictedAppDetails(mFragment, mAppInfos); diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java index d52a9676c23..33ac5df4a4b 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java @@ -22,7 +22,6 @@ import android.content.Context; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto; import com.android.internal.util.CollectionUtils; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper; @@ -65,14 +64,14 @@ public class RestrictAppAction extends BatteryTipAction { if (CollectionUtils.isEmpty(appInfo.anomalyTypes)) { // Only log context if there is no anomaly type mMetricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN, - MetricsProto.MetricsEvent.ACTION_TIP_RESTRICT_APP, + SettingsEnums.ACTION_TIP_RESTRICT_APP, metricsKey, packageName, 0); } else { for (int type : appInfo.anomalyTypes) { mMetricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN, - MetricsProto.MetricsEvent.ACTION_TIP_RESTRICT_APP, + SettingsEnums.ACTION_TIP_RESTRICT_APP, metricsKey, packageName, type); diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java index 10a09c54f53..f6b9c94dfd9 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java @@ -16,9 +16,10 @@ package com.android.settings.fuelgauge.batterytip.actions; +import android.app.settings.SettingsEnums; + import androidx.fragment.app.Fragment; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.core.SubSettingLauncher; @@ -41,7 +42,7 @@ public class SmartBatteryAction extends BatteryTipAction { @Override public void handlePositiveAction(int metricsKey) { mMetricsFeatureProvider.action(mContext, - MetricsProto.MetricsEvent.ACTION_TIP_OPEN_SMART_BATTERY, metricsKey); + SettingsEnums.ACTION_TIP_OPEN_SMART_BATTERY, metricsKey); new SubSettingLauncher(mSettingsActivity) .setSourceMetricsCategory(mFragment instanceof Instrumentable ? ((Instrumentable) mFragment).getMetricsCategory() diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java index db882e5bac7..0ef2c0f13bc 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java @@ -22,7 +22,6 @@ import android.content.Context; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip; @@ -52,7 +51,7 @@ public class UnrestrictAppAction extends BatteryTipAction { AppOpsManager.MODE_ALLOWED); mMetricsFeatureProvider.action( SettingsEnums.PAGE_UNKNOWN, - MetricsProto.MetricsEvent.ACTION_TIP_UNRESTRICT_APP, + SettingsEnums.ACTION_TIP_UNRESTRICT_APP, metricsKey, appInfo.packageName, 0); diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java index de71ab2d98f..54eb913a308 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java @@ -26,7 +26,6 @@ import androidx.annotation.IntDef; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import com.android.settings.widget.CardPreference; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import java.lang.annotation.Retention; diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTip.java index 28065fd8dbc..7674c095f82 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTip.java @@ -16,10 +16,10 @@ package com.android.settings.fuelgauge.batterytip.tips; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Parcel; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -79,7 +79,7 @@ public class EarlyWarningTip extends BatteryTip { @Override public void log(Context context, MetricsFeatureProvider metricsFeatureProvider) { - metricsFeatureProvider.action(context, MetricsProto.MetricsEvent.ACTION_EARLY_WARNING_TIP, + metricsFeatureProvider.action(context, SettingsEnums.ACTION_EARLY_WARNING_TIP, mState); } diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java index 356097dfbda..0a7b1ab35bc 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java @@ -16,13 +16,13 @@ package com.android.settings.fuelgauge.batterytip.tips; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -81,12 +81,12 @@ public class HighUsageTip extends BatteryTip { @Override public void log(Context context, MetricsFeatureProvider metricsFeatureProvider) { - metricsFeatureProvider.action(context, MetricsProto.MetricsEvent.ACTION_HIGH_USAGE_TIP, + metricsFeatureProvider.action(context, SettingsEnums.ACTION_HIGH_USAGE_TIP, mState); for (int i = 0, size = mHighUsageAppList.size(); i < size; i++) { final AppInfo appInfo = mHighUsageAppList.get(i); metricsFeatureProvider.action(context, - MetricsProto.MetricsEvent.ACTION_HIGH_USAGE_TIP_LIST, + SettingsEnums.ACTION_HIGH_USAGE_TIP_LIST, appInfo.packageName); } } diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTip.java index b48a7dd4680..d7acdd29fc9 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTip.java @@ -16,11 +16,11 @@ package com.android.settings.fuelgauge.batterytip.tips; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -55,7 +55,7 @@ public class LowBatteryTip extends EarlyWarningTip { @Override public void log(Context context, MetricsFeatureProvider metricsFeatureProvider) { - metricsFeatureProvider.action(context, MetricsProto.MetricsEvent.ACTION_LOW_BATTERY_TIP, + metricsFeatureProvider.action(context, SettingsEnums.ACTION_LOW_BATTERY_TIP, mState); } diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java index f16673484ec..1bd760b6da8 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java @@ -24,7 +24,6 @@ import android.os.Parcel; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.fuelgauge.batterytip.AppInfo; @@ -120,14 +119,14 @@ public class RestrictAppTip extends BatteryTip { @Override public void log(Context context, MetricsFeatureProvider metricsFeatureProvider) { - metricsFeatureProvider.action(context, MetricsProto.MetricsEvent.ACTION_APP_RESTRICTION_TIP, + metricsFeatureProvider.action(context, SettingsEnums.ACTION_APP_RESTRICTION_TIP, mState); if (mState == StateType.NEW) { for (int i = 0, size = mRestrictAppList.size(); i < size; i++) { final AppInfo appInfo = mRestrictAppList.get(i); for (Integer anomalyType : appInfo.anomalyTypes) { metricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN, - MetricsProto.MetricsEvent.ACTION_APP_RESTRICTION_TIP_LIST, + SettingsEnums.ACTION_APP_RESTRICTION_TIP_LIST, SettingsEnums.PAGE_UNKNOWN, appInfo.packageName, anomalyType); diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java index e8dc6a9e789..106766ff92a 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java @@ -16,10 +16,10 @@ package com.android.settings.fuelgauge.batterytip.tips; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Parcel; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -58,7 +58,7 @@ public class SmartBatteryTip extends BatteryTip { @Override public void log(Context context, MetricsFeatureProvider metricsFeatureProvider) { - metricsFeatureProvider.action(context, MetricsProto.MetricsEvent.ACTION_SMART_BATTERY_TIP, + metricsFeatureProvider.action(context, SettingsEnums.ACTION_SMART_BATTERY_TIP, mState); } diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java index 0e2e8b59ffa..aec6456c50d 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java @@ -16,13 +16,13 @@ package com.android.settings.fuelgauge.batterytip.tips; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -71,7 +71,7 @@ public class SummaryTip extends BatteryTip { @Override public void log(Context context, MetricsFeatureProvider metricsFeatureProvider) { - metricsFeatureProvider.action(context, MetricsProto.MetricsEvent.ACTION_SUMMARY_TIP, + metricsFeatureProvider.action(context, SettingsEnums.ACTION_SUMMARY_TIP, mState); } diff --git a/src/com/android/settings/gestures/AssistGestureSettings.java b/src/com/android/settings/gestures/AssistGestureSettings.java index bbd148c7839..b67fd659287 100644 --- a/src/com/android/settings/gestures/AssistGestureSettings.java +++ b/src/com/android/settings/gestures/AssistGestureSettings.java @@ -16,10 +16,10 @@ package com.android.settings.gestures; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.overlay.FeatureFactory; @@ -39,7 +39,7 @@ public class AssistGestureSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_ASSIST_GESTURE; + return SettingsEnums.SETTINGS_ASSIST_GESTURE; } @Override diff --git a/src/com/android/settings/gestures/DoubleTapPowerSettings.java b/src/com/android/settings/gestures/DoubleTapPowerSettings.java index 8afd2c1f64e..acabdbc6795 100644 --- a/src/com/android/settings/gestures/DoubleTapPowerSettings.java +++ b/src/com/android/settings/gestures/DoubleTapPowerSettings.java @@ -16,11 +16,11 @@ package com.android.settings.gestures; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.SharedPreferences; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; @@ -50,7 +50,7 @@ public class DoubleTapPowerSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_GESTURE_DOUBLE_TAP_POWER; + return SettingsEnums.SETTINGS_GESTURE_DOUBLE_TAP_POWER; } @Override diff --git a/src/com/android/settings/gestures/DoubleTapScreenSettings.java b/src/com/android/settings/gestures/DoubleTapScreenSettings.java index 496a45d74e8..81225042b4f 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenSettings.java +++ b/src/com/android/settings/gestures/DoubleTapScreenSettings.java @@ -16,12 +16,12 @@ package com.android.settings.gestures; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.SharedPreferences; import android.provider.SearchIndexableResource; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; @@ -54,7 +54,7 @@ public class DoubleTapScreenSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_GESTURE_DOUBLE_TAP_SCREEN; + return SettingsEnums.SETTINGS_GESTURE_DOUBLE_TAP_SCREEN; } @Override diff --git a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java index 145a06c55f5..34819299b00 100644 --- a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java +++ b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java @@ -16,11 +16,11 @@ package com.android.settings.gestures; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.SharedPreferences; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; @@ -50,7 +50,7 @@ public class DoubleTwistGestureSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_GESTURE_DOUBLE_TWIST; + return SettingsEnums.SETTINGS_GESTURE_DOUBLE_TWIST; } @Override diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java index c4911fed746..c41d3c63e2a 100644 --- a/src/com/android/settings/gestures/GestureSettings.java +++ b/src/com/android/settings/gestures/GestureSettings.java @@ -16,11 +16,11 @@ package com.android.settings.gestures; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -38,7 +38,7 @@ public class GestureSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_GESTURES; + return SettingsEnums.SETTINGS_GESTURES; } @Override diff --git a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java index 00b7a0c1b09..9366a159817 100644 --- a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java +++ b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java @@ -20,6 +20,8 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; +import androidx.annotation.NonNull; + import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; @@ -29,8 +31,6 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.ArrayList; import java.util.List; -import androidx.annotation.NonNull; - public class GesturesSettingPreferenceController extends BasePreferenceController { private final AssistGestureFeatureProvider mFeatureProvider; private List mGestureControllers; diff --git a/src/com/android/settings/gestures/PickupGestureSettings.java b/src/com/android/settings/gestures/PickupGestureSettings.java index 05aba4e99e0..6d479027bf0 100644 --- a/src/com/android/settings/gestures/PickupGestureSettings.java +++ b/src/com/android/settings/gestures/PickupGestureSettings.java @@ -16,12 +16,12 @@ package com.android.settings.gestures; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.SharedPreferences; import android.provider.SearchIndexableResource; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; @@ -54,7 +54,7 @@ public class PickupGestureSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_GESTURE_PICKUP; + return SettingsEnums.SETTINGS_GESTURE_PICKUP; } @Override diff --git a/src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java b/src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java index 8f037ce45c4..d22e42a8713 100644 --- a/src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java +++ b/src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java @@ -24,6 +24,10 @@ import android.os.Bundle; import android.os.Handler; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; @@ -37,10 +41,6 @@ import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - public class PreventRingingGesturePreferenceController extends AbstractPreferenceController implements RadioButtonPreference.OnClickListener, LifecycleObserver, OnSaveInstanceState, OnResume, OnPause, OnCreate, PreferenceControllerMixin { diff --git a/src/com/android/settings/gestures/PreventRingingGestureSettings.java b/src/com/android/settings/gestures/PreventRingingGestureSettings.java index 420a01985e3..47cd3ea6ed6 100644 --- a/src/com/android/settings/gestures/PreventRingingGestureSettings.java +++ b/src/com/android/settings/gestures/PreventRingingGestureSettings.java @@ -16,10 +16,10 @@ package com.android.settings.gestures; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -56,7 +56,7 @@ public class PreventRingingGestureSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_PREVENT_RINGING; + return SettingsEnums.SETTINGS_PREVENT_RINGING; } @Override diff --git a/src/com/android/settings/gestures/SwipeToNotificationSettings.java b/src/com/android/settings/gestures/SwipeToNotificationSettings.java index 6090eb27f55..230cdda27c2 100644 --- a/src/com/android/settings/gestures/SwipeToNotificationSettings.java +++ b/src/com/android/settings/gestures/SwipeToNotificationSettings.java @@ -16,11 +16,11 @@ package com.android.settings.gestures; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.SharedPreferences; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; @@ -50,7 +50,7 @@ public class SwipeToNotificationSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_GESTURE_SWIPE_TO_NOTIFICATION; + return SettingsEnums.SETTINGS_GESTURE_SWIPE_TO_NOTIFICATION; } @Override diff --git a/src/com/android/settings/gestures/SwipeUpGestureSettings.java b/src/com/android/settings/gestures/SwipeUpGestureSettings.java index 41a1aa44271..a1256439224 100644 --- a/src/com/android/settings/gestures/SwipeUpGestureSettings.java +++ b/src/com/android/settings/gestures/SwipeUpGestureSettings.java @@ -16,11 +16,11 @@ package com.android.settings.gestures; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.SharedPreferences; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; @@ -50,7 +50,7 @@ public class SwipeUpGestureSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_GESTURE_SWIPE_UP; + return SettingsEnums.SETTINGS_GESTURE_SWIPE_UP; } @Override diff --git a/src/com/android/settings/gestures/WakeLockScreenGestureSettings.java b/src/com/android/settings/gestures/WakeLockScreenGestureSettings.java index e6b7265cb65..0fbdaa1a3a4 100644 --- a/src/com/android/settings/gestures/WakeLockScreenGestureSettings.java +++ b/src/com/android/settings/gestures/WakeLockScreenGestureSettings.java @@ -16,12 +16,12 @@ package com.android.settings.gestures; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.SharedPreferences; import android.provider.SearchIndexableResource; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; @@ -54,7 +54,7 @@ public class WakeLockScreenGestureSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_GESTURE_WAKE_LOCK_SCREEN; + return SettingsEnums.SETTINGS_GESTURE_WAKE_LOCK_SCREEN; } @Override diff --git a/src/com/android/settings/homepage/TopLevelSettings.java b/src/com/android/settings/homepage/TopLevelSettings.java index 8f70b2b3ed6..f5dee0c2564 100644 --- a/src/com/android/settings/homepage/TopLevelSettings.java +++ b/src/com/android/settings/homepage/TopLevelSettings.java @@ -16,10 +16,10 @@ package com.android.settings.homepage; -import static com.android.settings.search.actionbar.SearchMenuController - .NEED_SEARCH_ICON_IN_ACTION_BAR; +import static com.android.settings.search.actionbar.SearchMenuController.NEED_SEARCH_ICON_IN_ACTION_BAR; import static com.android.settingslib.search.SearchIndexable.MOBILE; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; @@ -28,7 +28,6 @@ import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settings.dashboard.DashboardFragment; @@ -65,7 +64,7 @@ public class TopLevelSettings extends DashboardFragment implements @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DASHBOARD_SUMMARY; + return SettingsEnums.DASHBOARD_SUMMARY; } @Override diff --git a/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java index a4a5a7a0f07..2f55b3f5f57 100644 --- a/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java +++ b/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java @@ -16,6 +16,7 @@ package com.android.settings.homepage.contextualcards.conditional; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -23,7 +24,6 @@ import android.content.IntentFilter; import android.net.ConnectivityManager; import android.provider.Settings; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.homepage.contextualcards.ContextualCard; import com.android.settingslib.WirelessUtils; @@ -72,7 +72,7 @@ public class AirplaneModeConditionController implements ConditionalCardControlle public ContextualCard buildContextualCard() { return new ConditionalContextualCard.Builder() .setConditionId(ID) - .setMetricsConstant(MetricsProto.MetricsEvent.SETTINGS_CONDITION_AIRPLANE_MODE) + .setMetricsConstant(SettingsEnums.SETTINGS_CONDITION_AIRPLANE_MODE) .setActionText(mAppContext.getText(R.string.condition_turn_off)) .setName(mAppContext.getPackageName() + "/" + mAppContext.getText(R.string.condition_airplane_title)) diff --git a/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionController.java index 550dfc02df3..419e5c6f7a7 100644 --- a/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionController.java +++ b/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionController.java @@ -16,11 +16,11 @@ package com.android.settings.homepage.contextualcards.conditional; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.net.NetworkPolicyManager; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Settings; import com.android.settings.homepage.contextualcards.ContextualCard; @@ -66,7 +66,7 @@ public class BackgroundDataConditionController implements ConditionalCardControl public ContextualCard buildContextualCard() { return new ConditionalContextualCard.Builder() .setConditionId(ID) - .setMetricsConstant(MetricsProto.MetricsEvent.SETTINGS_CONDITION_BACKGROUND_DATA) + .setMetricsConstant(SettingsEnums.SETTINGS_CONDITION_BACKGROUND_DATA) .setActionText(mAppContext.getText(R.string.condition_turn_off)) .setName(mAppContext.getPackageName() + "/" + mAppContext.getText(R.string.condition_bg_data_title)) diff --git a/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionController.java index 73aa5886534..b90c1b5c417 100644 --- a/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionController.java +++ b/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionController.java @@ -16,10 +16,10 @@ package com.android.settings.homepage.contextualcards.conditional; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.PowerManager; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settings.fuelgauge.BatterySaverReceiver; @@ -60,7 +60,7 @@ public class BatterySaverConditionController implements ConditionalCardControlle public void onPrimaryClick(Context context) { new SubSettingLauncher(context) .setDestination(BatterySaverSettings.class.getName()) - .setSourceMetricsCategory(MetricsProto.MetricsEvent.DASHBOARD_SUMMARY) + .setSourceMetricsCategory(SettingsEnums.DASHBOARD_SUMMARY) .setTitleRes(R.string.battery_saver) .launch(); } @@ -75,7 +75,7 @@ public class BatterySaverConditionController implements ConditionalCardControlle public ContextualCard buildContextualCard() { return new ConditionalContextualCard.Builder() .setConditionId(ID) - .setMetricsConstant(MetricsProto.MetricsEvent.SETTINGS_CONDITION_BATTERY_SAVER) + .setMetricsConstant(SettingsEnums.SETTINGS_CONDITION_BATTERY_SAVER) .setActionText(mAppContext.getText(R.string.condition_turn_off)) .setName(mAppContext.getPackageName() + "/" + mAppContext.getText(R.string.condition_battery_title)) diff --git a/src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionController.java index f512d92f9c5..93b937b59a4 100644 --- a/src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionController.java +++ b/src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionController.java @@ -16,6 +16,7 @@ package com.android.settings.homepage.contextualcards.conditional; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -23,7 +24,6 @@ import android.content.IntentFilter; import android.net.ConnectivityManager; import android.telephony.TelephonyManager; -import com.android.internal.logging.nano.MetricsProto; import com.android.internal.telephony.TelephonyIntents; import com.android.settings.R; import com.android.settings.Settings; @@ -82,7 +82,7 @@ public class CellularDataConditionController implements ConditionalCardControlle public ContextualCard buildContextualCard() { return new ConditionalContextualCard.Builder() .setConditionId(ID) - .setMetricsConstant(MetricsProto.MetricsEvent.SETTINGS_CONDITION_CELLULAR_DATA) + .setMetricsConstant(SettingsEnums.SETTINGS_CONDITION_CELLULAR_DATA) .setActionText(mAppContext.getText(R.string.condition_turn_on)) .setName(mAppContext.getPackageName() + "/" + mAppContext.getText(R.string.condition_cellular_title)) diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java index fc936bca352..18019a60ffd 100644 --- a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java +++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java @@ -16,6 +16,7 @@ package com.android.settings.homepage.contextualcards.conditional; +import android.app.settings.SettingsEnums; import android.content.Context; import android.text.TextUtils; import android.view.View; @@ -26,7 +27,6 @@ import android.widget.TextView; import androidx.annotation.LayoutRes; import androidx.recyclerview.widget.RecyclerView; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.homepage.contextualcards.ContextualCard; import com.android.settings.homepage.contextualcards.ContextualCardRenderer; @@ -64,7 +64,7 @@ public class ConditionContextualCardRenderer implements ContextualCardRenderer { final MetricsFeatureProvider metricsFeatureProvider = FeatureFactory.getFactory( mContext).getMetricsFeatureProvider(); - metricsFeatureProvider.visible(mContext, MetricsProto.MetricsEvent.SETTINGS_HOMEPAGE, + metricsFeatureProvider.visible(mContext, SettingsEnums.SETTINGS_HOMEPAGE, card.getMetricsConstant()); initializePrimaryClick(view, card, metricsFeatureProvider); initializeView(view, card); @@ -76,7 +76,7 @@ public class ConditionContextualCardRenderer implements ContextualCardRenderer { view.itemView.findViewById(R.id.content).setOnClickListener( v -> { metricsFeatureProvider.action(mContext, - MetricsProto.MetricsEvent.ACTION_SETTINGS_CONDITION_CLICK, + SettingsEnums.ACTION_SETTINGS_CONDITION_CLICK, card.getMetricsConstant()); mControllerRendererPool.getController(mContext, card.getCardType()).onPrimaryClick(card); @@ -101,7 +101,7 @@ public class ConditionContextualCardRenderer implements ContextualCardRenderer { button.setOnClickListener(v -> { final Context viewContext = v.getContext(); metricsFeatureProvider.action( - viewContext, MetricsProto.MetricsEvent.ACTION_SETTINGS_CONDITION_BUTTON, + viewContext, SettingsEnums.ACTION_SETTINGS_CONDITION_BUTTON, card.getMetricsConstant()); mControllerRendererPool.getController(mContext, card.getCardType()) .onActionClick(card); diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRenderer.java index 53de5410188..a516e13b900 100644 --- a/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRenderer.java +++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRenderer.java @@ -23,7 +23,6 @@ import android.view.View; import androidx.annotation.LayoutRes; import androidx.recyclerview.widget.RecyclerView; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.homepage.contextualcards.ContextualCard; import com.android.settings.homepage.contextualcards.ContextualCardRenderer; @@ -55,7 +54,7 @@ public class ConditionFooterContextualCardRenderer implements ContextualCardRend mContext).getMetricsFeatureProvider(); holder.itemView.setOnClickListener(v -> { metricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN, - MetricsProto.MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND, + SettingsEnums.ACTION_SETTINGS_CONDITION_EXPAND, SettingsEnums.SETTINGS_HOMEPAGE, null /* key */, 0 /* false */); diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRenderer.java index d7fbee6c4a1..2aa8acad473 100644 --- a/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRenderer.java +++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRenderer.java @@ -26,7 +26,6 @@ import android.widget.LinearLayout; import androidx.annotation.LayoutRes; import androidx.recyclerview.widget.RecyclerView; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.homepage.contextualcards.ContextualCard; import com.android.settings.homepage.contextualcards.ContextualCardRenderer; @@ -68,7 +67,7 @@ public class ConditionHeaderContextualCardRenderer implements ContextualCardRend }); view.itemView.setOnClickListener(v -> { metricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN, - MetricsProto.MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND, + SettingsEnums.ACTION_SETTINGS_CONDITION_EXPAND, SettingsEnums.SETTINGS_HOMEPAGE, null /* key */, 1 /* true */); diff --git a/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java b/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java index 488280c56e2..43ff537d0e5 100644 --- a/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java +++ b/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java @@ -17,6 +17,7 @@ package com.android.settings.homepage.contextualcards.conditional; import android.app.NotificationManager; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -25,7 +26,6 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settings.homepage.contextualcards.ContextualCard; @@ -78,7 +78,7 @@ public class DndConditionCardController implements ConditionalCardController { public void onPrimaryClick(Context context) { new SubSettingLauncher(context) .setDestination(ZenModeSettings.class.getName()) - .setSourceMetricsCategory(MetricsProto.MetricsEvent.SETTINGS_HOMEPAGE) + .setSourceMetricsCategory(SettingsEnums.SETTINGS_HOMEPAGE) .setTitleRes(R.string.zen_mode_settings_title) .launch(); } @@ -92,7 +92,7 @@ public class DndConditionCardController implements ConditionalCardController { public ContextualCard buildContextualCard() { return new ConditionalContextualCard.Builder() .setConditionId(ID) - .setMetricsConstant(MetricsProto.MetricsEvent.SETTINGS_CONDITION_DND) + .setMetricsConstant(SettingsEnums.SETTINGS_CONDITION_DND) .setActionText(mAppContext.getText(R.string.condition_turn_off)) .setName(mAppContext.getPackageName() + "/" + mAppContext.getText(R.string.condition_zen_title)) diff --git a/src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionController.java index 1305c2651c9..fe5bc933e47 100644 --- a/src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionController.java +++ b/src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionController.java @@ -16,6 +16,7 @@ package com.android.settings.homepage.contextualcards.conditional; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -26,7 +27,6 @@ import android.net.wifi.WifiManager; import android.os.UserHandle; import android.os.UserManager; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.TetherSettings; import com.android.settings.core.SubSettingLauncher; @@ -69,7 +69,7 @@ public class HotspotConditionController implements ConditionalCardController { public void onPrimaryClick(Context context) { new SubSettingLauncher(context) .setDestination(TetherSettings.class.getName()) - .setSourceMetricsCategory(MetricsProto.MetricsEvent.DASHBOARD_SUMMARY) + .setSourceMetricsCategory(SettingsEnums.DASHBOARD_SUMMARY) .setTitleRes(R.string.tether_settings_title_all) .launch(); } @@ -92,7 +92,7 @@ public class HotspotConditionController implements ConditionalCardController { public ContextualCard buildContextualCard() { return new ConditionalContextualCard.Builder() .setConditionId(ID) - .setMetricsConstant(MetricsProto.MetricsEvent.SETTINGS_CONDITION_HOTSPOT) + .setMetricsConstant(SettingsEnums.SETTINGS_CONDITION_HOTSPOT) .setActionText(mAppContext.getText(R.string.condition_turn_off)) .setName(mAppContext.getPackageName() + "/" + mAppContext.getText(R.string.condition_hotspot_title)) diff --git a/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionController.java index 09d3ba7fd60..a673e46b689 100644 --- a/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionController.java +++ b/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionController.java @@ -16,10 +16,10 @@ package com.android.settings.homepage.contextualcards.conditional; +import android.app.settings.SettingsEnums; import android.content.Context; import com.android.internal.app.ColorDisplayController; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settings.display.NightDisplaySettings; @@ -55,7 +55,7 @@ public class NightDisplayConditionController implements ConditionalCardControlle public void onPrimaryClick(Context context) { new SubSettingLauncher(context) .setDestination(NightDisplaySettings.class.getName()) - .setSourceMetricsCategory(MetricsProto.MetricsEvent.SETTINGS_HOMEPAGE) + .setSourceMetricsCategory(SettingsEnums.SETTINGS_HOMEPAGE) .setTitleRes(R.string.night_display_title) .launch(); } @@ -69,7 +69,7 @@ public class NightDisplayConditionController implements ConditionalCardControlle public ContextualCard buildContextualCard() { return new ConditionalContextualCard.Builder() .setConditionId(ID) - .setMetricsConstant(MetricsProto.MetricsEvent.SETTINGS_CONDITION_NIGHT_DISPLAY) + .setMetricsConstant(SettingsEnums.SETTINGS_CONDITION_NIGHT_DISPLAY) .setActionText(mAppContext.getText(R.string.condition_turn_off)) .setName(mAppContext.getPackageName() + "/" + mAppContext.getText(R.string.condition_night_display_title)) diff --git a/src/com/android/settings/homepage/contextualcards/conditional/RingerMutedConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/RingerMutedConditionController.java index 38590f6fd8e..f800f9200a2 100644 --- a/src/com/android/settings/homepage/contextualcards/conditional/RingerMutedConditionController.java +++ b/src/com/android/settings/homepage/contextualcards/conditional/RingerMutedConditionController.java @@ -16,10 +16,10 @@ package com.android.settings.homepage.contextualcards.conditional; +import android.app.settings.SettingsEnums; import android.content.Context; import android.media.AudioManager; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.homepage.contextualcards.ContextualCard; @@ -49,7 +49,7 @@ public class RingerMutedConditionController extends AbnormalRingerConditionContr public ContextualCard buildContextualCard() { return new ConditionalContextualCard.Builder() .setConditionId(ID) - .setMetricsConstant(MetricsProto.MetricsEvent.SETTINGS_CONDITION_DEVICE_MUTED) + .setMetricsConstant(SettingsEnums.SETTINGS_CONDITION_DEVICE_MUTED) .setActionText( mAppContext.getText(R.string.condition_device_muted_action_turn_on_sound)) .setName(mAppContext.getPackageName() + "/" diff --git a/src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionController.java index eee364f3e91..c19311669d7 100644 --- a/src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionController.java +++ b/src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionController.java @@ -16,10 +16,10 @@ package com.android.settings.homepage.contextualcards.conditional; +import android.app.settings.SettingsEnums; import android.content.Context; import android.media.AudioManager; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.homepage.contextualcards.ContextualCard; @@ -50,7 +50,7 @@ public class RingerVibrateConditionController extends AbnormalRingerConditionCon public ContextualCard buildContextualCard() { return new ConditionalContextualCard.Builder() .setConditionId(ID) - .setMetricsConstant(MetricsProto.MetricsEvent.SETTINGS_CONDITION_DEVICE_VIBRATE) + .setMetricsConstant(SettingsEnums.SETTINGS_CONDITION_DEVICE_VIBRATE) .setActionText( mAppContext.getText(R.string.condition_device_muted_action_turn_on_sound)) .setName(mAppContext.getPackageName() + "/" diff --git a/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionController.java index 26616f07220..4e901fd191f 100644 --- a/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionController.java +++ b/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionController.java @@ -16,6 +16,7 @@ package com.android.settings.homepage.contextualcards.conditional; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -25,7 +26,6 @@ import android.os.UserHandle; import android.os.UserManager; import android.text.TextUtils; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Settings; import com.android.settings.homepage.contextualcards.ContextualCard; @@ -86,7 +86,7 @@ public class WorkModeConditionController implements ConditionalCardController { public ContextualCard buildContextualCard() { return new ConditionalContextualCard.Builder() .setConditionId(ID) - .setMetricsConstant(MetricsProto.MetricsEvent.SETTINGS_CONDITION_WORK_MODE) + .setMetricsConstant(SettingsEnums.SETTINGS_CONDITION_WORK_MODE) .setActionText(mAppContext.getText(R.string.condition_turn_on)) .setName(mAppContext.getPackageName() + "/" + mAppContext.getText(R.string.condition_work_title)) diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/BatteryInfoSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/BatteryInfoSlice.java index 41095a48601..6c7f930a5e2 100644 --- a/src/com/android/settings/homepage/contextualcards/deviceinfo/BatteryInfoSlice.java +++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/BatteryInfoSlice.java @@ -17,6 +17,7 @@ package com.android.settings.homepage.contextualcards.deviceinfo; import android.app.PendingIntent; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -29,7 +30,6 @@ import androidx.slice.Slice; import androidx.slice.builders.ListBuilder; import androidx.slice.builders.SliceAction; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SubSettings; import com.android.settings.Utils; @@ -94,7 +94,7 @@ public class BatteryInfoSlice implements CustomSliceable { final String screenTitle = mContext.getText(R.string.power_usage_summary_title).toString(); return SliceBuilderUtils.buildSearchResultPageIntent(mContext, PowerUsageSummary.class.getName(), "" /* key */, screenTitle, - MetricsProto.MetricsEvent.SLICE) + SettingsEnums.SLICE) .setClassName(mContext.getPackageName(), SubSettings.class.getName()) .setData(CustomSliceRegistry.BATTERY_INFO_SLICE_URI); } diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java index 6e94f6dd80c..419b7708675 100644 --- a/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java +++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java @@ -17,6 +17,7 @@ package com.android.settings.homepage.contextualcards.deviceinfo; import android.app.PendingIntent; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.net.Uri; @@ -32,7 +33,6 @@ import androidx.slice.builders.ListBuilder; import androidx.slice.builders.SliceAction; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SubSettings; import com.android.settings.Utils; @@ -93,7 +93,7 @@ public class DataUsageSlice implements CustomSliceable { final String screenTitle = mContext.getText(R.string.data_usage_wifi_title).toString(); return SliceBuilderUtils.buildSearchResultPageIntent(mContext, DataUsageSummary.class.getName(), "" /* key */, screenTitle, - MetricsProto.MetricsEvent.SLICE) + SettingsEnums.SLICE) .setClassName(mContext.getPackageName(), SubSettings.class.getName()) .setData(CustomSliceRegistry.DATA_USAGE_SLICE_URI); } diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java index a2f71ec783d..e278baae130 100644 --- a/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java +++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java @@ -17,6 +17,7 @@ package com.android.settings.homepage.contextualcards.deviceinfo; import android.app.PendingIntent; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.net.Uri; @@ -32,7 +33,6 @@ import androidx.slice.Slice; import androidx.slice.builders.ListBuilder; import androidx.slice.builders.SliceAction; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SubSettings; import com.android.settings.Utils; @@ -84,7 +84,7 @@ public class DeviceInfoSlice implements CustomSliceable { final String screenTitle = mContext.getText(R.string.device_info_label).toString(); return SliceBuilderUtils.buildSearchResultPageIntent(mContext, MyDeviceInfoFragment.class.getName(), "" /* key */, screenTitle, - MetricsProto.MetricsEvent.SLICE) + SettingsEnums.SLICE) .setClassName(mContext.getPackageName(), SubSettings.class.getName()) .setData(CustomSliceRegistry.DEVICE_INFO_SLICE_URI); } diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java index 799a7019d64..d03b3593bdb 100644 --- a/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java +++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java @@ -17,6 +17,7 @@ package com.android.settings.homepage.contextualcards.deviceinfo; import android.app.PendingIntent; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.net.Uri; @@ -29,7 +30,6 @@ import androidx.slice.builders.ListBuilder; import androidx.slice.builders.SliceAction; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SubSettings; import com.android.settings.Utils; @@ -79,7 +79,7 @@ public class StorageSlice implements CustomSliceable { final String screenTitle = mContext.getText(R.string.storage_label).toString(); return SliceBuilderUtils.buildSearchResultPageIntent(mContext, StorageDashboardFragment.class.getName(), "" /* key */, screenTitle, - MetricsProto.MetricsEvent.SLICE) + SettingsEnums.SLICE) .setClassName(mContext.getPackageName(), SubSettings.class.getName()) .setData(CustomSliceRegistry.STORAGE_SLICE_URI); } diff --git a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java index c0cfb3f1430..5b5d4747469 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java @@ -21,6 +21,7 @@ import static android.content.Context.MODE_PRIVATE; import static com.android.settings.slices.CustomSliceRegistry.BATTERY_FIX_SLICE_URI; import android.app.PendingIntent; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; @@ -34,7 +35,6 @@ import androidx.slice.builders.ListBuilder; import androidx.slice.builders.ListBuilder.RowBuilder; import androidx.slice.builders.SliceAction; -import com.android.internal.logging.nano.MetricsProto; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; import com.android.settings.SubSettings; @@ -125,7 +125,7 @@ public class BatteryFixSlice implements CustomSliceable { return SliceBuilderUtils.buildSearchResultPageIntent(mContext, PowerUsageSummary.class.getName(), BatteryTipPreferenceController.PREF_NAME, screenTitle, - MetricsProto.MetricsEvent.SLICE) + SettingsEnums.SLICE) .setClassName(mContext.getPackageName(), SubSettings.class.getName()) .setData(contentUri); } diff --git a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java index b2bec7f4632..03868ee67e3 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java @@ -36,7 +36,6 @@ import androidx.slice.builders.ListBuilder; import androidx.slice.builders.SliceAction; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SubSettings; import com.android.settings.Utils; @@ -158,7 +157,7 @@ public class BluetoothDevicesSlice implements CustomSliceable { return SliceBuilderUtils.buildSearchResultPageIntent(mContext, ConnectedDeviceDashboardFragment.class.getName(), "" /* key */, screenTitle, - MetricsProto.MetricsEvent.SLICE) + SettingsEnums.SLICE) .setClassName(mContext.getPackageName(), SubSettings.class.getName()) .setData(getUri()); } diff --git a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java index 03e430160b3..2bc09e9f72d 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java @@ -17,6 +17,7 @@ package com.android.settings.homepage.contextualcards.slices; import android.app.PendingIntent; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.net.Uri; @@ -29,7 +30,6 @@ import androidx.slice.builders.ListBuilder; import androidx.slice.builders.ListBuilder.RowBuilder; import androidx.slice.builders.SliceAction; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SubSettings; import com.android.settings.Utils; @@ -109,7 +109,7 @@ public class LowStorageSlice implements CustomSliceable { return SliceBuilderUtils.buildSearchResultPageIntent(mContext, StorageSettings.class.getName(), "" /* key */, screenTitle, - MetricsProto.MetricsEvent.SLICE) + SettingsEnums.SLICE) .setClassName(mContext.getPackageName(), SubSettings.class.getName()) .setData(CustomSliceRegistry.LOW_STORAGE_SLICE_URI); } diff --git a/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java index 0410176c40f..c8b5b6d7a75 100644 --- a/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java @@ -21,6 +21,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.app.Activity; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; @@ -34,7 +35,6 @@ import android.provider.SearchIndexableResource; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -90,7 +90,7 @@ public final class AvailableVirtualKeyboardFragment extends SettingsPreferenceFr @Override public int getMetricsCategory() { - return MetricsEvent.ENABLE_VIRTUAL_KEYBOARDS; + return SettingsEnums.ENABLE_VIRTUAL_KEYBOARDS; } @Nullable diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java index f3540893649..38df8d767da 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java +++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java @@ -16,12 +16,12 @@ package com.android.settings.inputmethod; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.text.TextUtils; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; @@ -31,7 +31,7 @@ public class InputMethodAndSubtypeEnabler extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.INPUTMETHOD_SUBTYPE_ENABLER; + return SettingsEnums.INPUTMETHOD_SUBTYPE_ENABLER; } @Override diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java index 5618697330c..f91c9d81cad 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java @@ -18,6 +18,7 @@ package com.android.settings.inputmethod; import android.app.Activity; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -40,7 +41,6 @@ import androidx.loader.app.LoaderManager.LoaderCallbacks; import androidx.loader.content.AsyncTaskLoader; import androidx.loader.content.Loader; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -66,7 +66,7 @@ public class KeyboardLayoutDialogFragment extends InstrumentedDialogFragment @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_KEYBOARD_LAYOUT; + return SettingsEnums.DIALOG_KEYBOARD_LAYOUT; } @Override diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java index 2c3f89ba632..a13ebc00ffd 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java @@ -16,10 +16,10 @@ package com.android.settings.inputmethod; +import android.app.settings.SettingsEnums; import android.content.Context; import android.hardware.input.InputDeviceIdentifier; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; @@ -36,7 +36,7 @@ public class KeyboardLayoutPickerFragment extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.INPUTMETHOD_KEYBOARD; + return SettingsEnums.INPUTMETHOD_KEYBOARD; } @Override diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java index 8d451788387..119571dc1c0 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java @@ -19,6 +19,7 @@ package com.android.settings.inputmethod; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.database.ContentObserver; @@ -39,7 +40,6 @@ import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.Preconditions; import com.android.settings.R; import com.android.settings.Settings; @@ -132,7 +132,7 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.PHYSICAL_KEYBOARDS; + return SettingsEnums.PHYSICAL_KEYBOARDS; } private void scheduleUpdateHardKeyboards() { diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java index 28704843506..974f2c41eaa 100644 --- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java +++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java @@ -16,6 +16,7 @@ package com.android.settings.inputmethod; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.content.pm.ApplicationInfo; @@ -33,7 +34,6 @@ import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; @@ -58,7 +58,7 @@ public class SpellCheckersSettings extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.INPUTMETHOD_SPELL_CHECKERS; + return SettingsEnums.INPUTMETHOD_SPELL_CHECKERS; } @Override diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java index fd33051a08a..dc2aa49f627 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java +++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java @@ -16,6 +16,7 @@ package com.android.settings.inputmethod; +import android.app.settings.SettingsEnums; import android.os.Bundle; import android.view.LayoutInflater; import android.view.Menu; @@ -25,7 +26,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.InstrumentedFragment; import com.android.settings.inputmethod.UserDictionaryAddWordContents.LocaleRenderer; @@ -105,7 +105,7 @@ public class UserDictionaryAddWordFragment extends InstrumentedFragment { @Override public int getMetricsCategory() { - return MetricsEvent.INPUTMETHOD_USER_DICTIONARY_ADD_WORD; + return SettingsEnums.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 b3ea47e2221..497b380ca63 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryList.java +++ b/src/com/android/settings/inputmethod/UserDictionaryList.java @@ -16,12 +16,12 @@ package com.android.settings.inputmethod; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -38,7 +38,7 @@ public class UserDictionaryList extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.INPUTMETHOD_USER_DICTIONARY; + return SettingsEnums.INPUTMETHOD_USER_DICTIONARY; } @Override diff --git a/src/com/android/settings/inputmethod/UserDictionarySettings.java b/src/com/android/settings/inputmethod/UserDictionarySettings.java index cdc8b072715..eccfb3c64fc 100644 --- a/src/com/android/settings/inputmethod/UserDictionarySettings.java +++ b/src/com/android/settings/inputmethod/UserDictionarySettings.java @@ -18,6 +18,7 @@ package com.android.settings.inputmethod; import android.annotation.Nullable; import android.app.ActionBar; +import android.app.settings.SettingsEnums; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; @@ -42,7 +43,6 @@ import androidx.fragment.app.ListFragment; import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settings.overlay.FeatureFactory; @@ -68,7 +68,7 @@ public class UserDictionarySettings extends ListFragment implements Instrumentab @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.USER_DICTIONARY_SETTINGS; + return SettingsEnums.USER_DICTIONARY_SETTINGS; } @Override diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java index e1c9615a9f9..cb7831ed783 100644 --- a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java @@ -18,6 +18,7 @@ package com.android.settings.inputmethod; import android.app.Activity; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; @@ -29,7 +30,6 @@ import android.view.inputmethod.InputMethodManager; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.Preconditions; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -75,7 +75,7 @@ public final class VirtualKeyboardFragment extends SettingsPreferenceFragment im @Override public int getMetricsCategory() { - return MetricsEvent.VIRTUAL_KEYBOARDS; + return SettingsEnums.VIRTUAL_KEYBOARDS; } private void updateInputMethodPreferenceViews() { diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java index ae0a5684c39..3a8aeac4b98 100644 --- a/src/com/android/settings/language/LanguageAndInputSettings.java +++ b/src/com/android/settings/language/LanguageAndInputSettings.java @@ -17,6 +17,7 @@ package com.android.settings.language; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; @@ -30,7 +31,6 @@ import android.view.inputmethod.InputMethodManager; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.SummaryLoader; @@ -58,7 +58,7 @@ public class LanguageAndInputSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_LANGUAGE_CATEGORY; + return SettingsEnums.SETTINGS_LANGUAGE_CATEGORY; } @Override diff --git a/src/com/android/settings/language/PhoneLanguagePreferenceController.java b/src/com/android/settings/language/PhoneLanguagePreferenceController.java index c88bdb615ff..4f67a8ff6eb 100644 --- a/src/com/android/settings/language/PhoneLanguagePreferenceController.java +++ b/src/com/android/settings/language/PhoneLanguagePreferenceController.java @@ -16,11 +16,11 @@ package com.android.settings.language; +import android.app.settings.SettingsEnums; import android.content.Context; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.SubSettingLauncher; @@ -74,7 +74,7 @@ public class PhoneLanguagePreferenceController extends AbstractPreferenceControl } new SubSettingLauncher(mContext) .setDestination(LocaleListEditor.class.getName()) - .setSourceMetricsCategory(MetricsProto.MetricsEvent.SETTINGS_LANGUAGE_CATEGORY) + .setSourceMetricsCategory(SettingsEnums.SETTINGS_LANGUAGE_CATEGORY) .setTitleRes(R.string.language_picker_title) .launch(); return true; diff --git a/src/com/android/settings/localepicker/LocaleListEditor.java b/src/com/android/settings/localepicker/LocaleListEditor.java index cb66764214b..bee51529561 100644 --- a/src/com/android/settings/localepicker/LocaleListEditor.java +++ b/src/com/android/settings/localepicker/LocaleListEditor.java @@ -19,6 +19,7 @@ package com.android.settings.localepicker; import static android.os.UserManager.DISALLOW_CONFIG_LOCALE; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; @@ -36,7 +37,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.internal.app.LocalePicker; import com.android.internal.app.LocaleStore; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.RestrictedSettingsFragment; @@ -68,7 +68,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment { @Override public int getMetricsCategory() { - return MetricsEvent.USER_LOCALE_LIST; + return SettingsEnums.USER_LOCALE_LIST; } @Override diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java index 78a15411703..68714281c8c 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -16,6 +16,7 @@ package com.android.settings.location; +import android.app.settings.SettingsEnums; import android.content.Context; import android.location.SettingInjectorService; import android.os.Bundle; @@ -24,7 +25,6 @@ import android.provider.SearchIndexableResource; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.dashboard.DashboardFragment; @@ -69,7 +69,7 @@ public class LocationSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.LOCATION; + return SettingsEnums.LOCATION; } @Override diff --git a/src/com/android/settings/location/LocationSlice.java b/src/com/android/settings/location/LocationSlice.java index 6dc4241865e..e2078e3a13b 100644 --- a/src/com/android/settings/location/LocationSlice.java +++ b/src/com/android/settings/location/LocationSlice.java @@ -23,6 +23,7 @@ import static androidx.slice.builders.ListBuilder.ICON_IMAGE; import android.annotation.ColorInt; import android.app.PendingIntent; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.net.Uri; @@ -33,7 +34,6 @@ import androidx.slice.builders.ListBuilder; import androidx.slice.builders.ListBuilder.RowBuilder; import androidx.slice.builders.SliceAction; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SubSettings; import com.android.settings.Utils; @@ -88,7 +88,7 @@ public class LocationSlice implements CustomSliceable { final Uri contentUri = new Uri.Builder().appendPath(KEY_LOCATION).build(); return SliceBuilderUtils.buildSearchResultPageIntent(mContext, LocationSettings.class.getName(), KEY_LOCATION, screenTitle, - MetricsEvent.LOCATION) + SettingsEnums.LOCATION) .setClassName(mContext.getPackageName(), SubSettings.class.getName()) .setData(contentUri); } diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/ScanningSettings.java index 86402c0934c..31ec9553d33 100644 --- a/src/com/android/settings/location/ScanningSettings.java +++ b/src/com/android/settings/location/ScanningSettings.java @@ -16,10 +16,10 @@ package com.android.settings.location; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -40,7 +40,7 @@ public class ScanningSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.LOCATION_SCANNING; + return SettingsEnums.LOCATION_SCANNING; } @Override diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java index 1c4e3516a3d..1490e8ae70f 100644 --- a/src/com/android/settings/network/AirplaneModePreferenceController.java +++ b/src/com/android/settings/network/AirplaneModePreferenceController.java @@ -21,7 +21,6 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.os.SystemProperties; -import android.text.TextUtils; import androidx.fragment.app.Fragment; import androidx.preference.Preference; diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java index a16be66c27c..4de402602ae 100644 --- a/src/com/android/settings/network/ApnEditor.java +++ b/src/com/android/settings/network/ApnEditor.java @@ -19,6 +19,7 @@ package com.android.settings.network; import static android.content.Context.TELEPHONY_SERVICE; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.ContentValues; import android.content.Context; import android.content.Intent; @@ -49,7 +50,6 @@ import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; import com.android.internal.util.ArrayUtils; import com.android.settings.R; @@ -483,7 +483,7 @@ public class ApnEditor extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.APN_EDITOR; + return SettingsEnums.APN_EDITOR; } @VisibleForTesting @@ -1202,7 +1202,7 @@ public class ApnEditor extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_APN_EDITOR_ERROR; + return SettingsEnums.DIALOG_APN_EDITOR_ERROR; } } diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java index ac3b1f6afe9..174257b027b 100755 --- a/src/com/android/settings/network/ApnSettings.java +++ b/src/com/android/settings/network/ApnSettings.java @@ -19,6 +19,7 @@ package com.android.settings.network; import android.app.Activity; import android.app.Dialog; import android.app.ProgressDialog; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.ContentValues; @@ -51,7 +52,6 @@ import android.widget.Toast; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.uicc.UiccController; @@ -173,7 +173,7 @@ public class ApnSettings extends RestrictedSettingsFragment @Override public int getMetricsCategory() { - return MetricsEvent.APN; + return SettingsEnums.APN; } @Override @@ -518,7 +518,7 @@ public class ApnSettings extends RestrictedSettingsFragment @Override public int getDialogMetricsCategory(int dialogId) { if (dialogId == DIALOG_RESTORE_DEFAULTAPN) { - return MetricsEvent.DIALOG_APN_RESTORE_DEFAULT; + return SettingsEnums.DIALOG_APN_RESTORE_DEFAULT; } return 0; } diff --git a/src/com/android/settings/network/MobileNetworkListController.java b/src/com/android/settings/network/MobileNetworkListController.java index bd198e642cf..7de6cdde953 100644 --- a/src/com/android/settings/network/MobileNetworkListController.java +++ b/src/com/android/settings/network/MobileNetworkListController.java @@ -26,6 +26,12 @@ import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.util.ArrayMap; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.LifecycleObserver; +import androidx.lifecycle.OnLifecycleEvent; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.network.telephony.MobileNetworkActivity; import com.android.settingslib.core.AbstractPreferenceController; @@ -33,12 +39,6 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.List; import java.util.Map; -import androidx.lifecycle.Lifecycle; -import androidx.lifecycle.LifecycleObserver; -import androidx.lifecycle.OnLifecycleEvent; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * This populates the entries on a page which lists all available mobile subscriptions. Each entry * has the name of the subscription with some subtext giving additional detail, and clicking on the diff --git a/src/com/android/settings/network/MobileNetworkSummaryController.java b/src/com/android/settings/network/MobileNetworkSummaryController.java index bbc4ea4b21f..cc156763550 100644 --- a/src/com/android/settings/network/MobileNetworkSummaryController.java +++ b/src/com/android/settings/network/MobileNetworkSummaryController.java @@ -24,18 +24,18 @@ import android.content.Intent; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; -import com.android.settings.R; -import com.android.settings.network.telephony.MobileNetworkActivity; -import com.android.settingslib.core.AbstractPreferenceController; - -import java.util.List; - import androidx.lifecycle.Lifecycle; import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.R; +import com.android.settings.network.telephony.MobileNetworkActivity; +import com.android.settingslib.core.AbstractPreferenceController; + +import java.util.List; + public class MobileNetworkSummaryController extends AbstractPreferenceController implements SubscriptionsChangeListener.SubscriptionsChangeListenerClient, LifecycleObserver { private static final String TAG = "MobileNetSummaryCtlr"; diff --git a/src/com/android/settings/network/MultiNetworkHeaderController.java b/src/com/android/settings/network/MultiNetworkHeaderController.java index 8860c477e9c..938c7535450 100644 --- a/src/com/android/settings/network/MultiNetworkHeaderController.java +++ b/src/com/android/settings/network/MultiNetworkHeaderController.java @@ -16,17 +16,17 @@ package com.android.settings.network; +import android.app.settings.SettingsEnums; import android.content.Context; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.core.BasePreferenceController; -import com.android.settings.wifi.WifiConnectionPreferenceController; -import com.android.settingslib.core.lifecycle.Lifecycle; - import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; +import com.android.settings.core.BasePreferenceController; +import com.android.settings.wifi.WifiConnectionPreferenceController; +import com.android.settingslib.core.lifecycle.Lifecycle; + // This controls a header at the top of the Network & internet page that only appears when there // are two or more active mobile subscriptions. It shows an overview of available network // connections with an entry for wifi (if connected) and an entry for each subscription. @@ -52,7 +52,7 @@ public class MultiNetworkHeaderController extends BasePreferenceController imple WifiConnectionPreferenceController createWifiController(Lifecycle lifecycle) { final int prefOrder = 0; return new WifiConnectionPreferenceController(mContext, lifecycle, this, mPreferenceKey, - prefOrder, MetricsProto.MetricsEvent.SETTINGS_NETWORK_CATEGORY); + prefOrder, SettingsEnums.SETTINGS_NETWORK_CATEGORY); } @VisibleForTesting diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java index efdb5561e97..7672c2ef058 100644 --- a/src/com/android/settings/network/NetworkDashboardFragment.java +++ b/src/com/android/settings/network/NetworkDashboardFragment.java @@ -15,10 +15,10 @@ */ package com.android.settings.network; -import static com.android.settings.network.MobilePlanPreferenceController - .MANAGE_MOBILE_PLAN_DIALOG_ID; +import static com.android.settings.network.MobilePlanPreferenceController.MANAGE_MOBILE_PLAN_DIALOG_ID; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; import android.util.Log; @@ -26,7 +26,6 @@ import android.util.Log; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.FeatureFlags; import com.android.settings.dashboard.DashboardFragment; @@ -51,7 +50,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_NETWORK_CATEGORY; + return SettingsEnums.SETTINGS_NETWORK_CATEGORY; } @Override @@ -158,7 +157,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements @Override public int getDialogMetricsCategory(int dialogId) { if (MANAGE_MOBILE_PLAN_DIALOG_ID == dialogId) { - return MetricsProto.MetricsEvent.DIALOG_MANAGE_MOBILE_PLAN; + return SettingsEnums.DIALOG_MANAGE_MOBILE_PLAN; } return 0; } diff --git a/src/com/android/settings/network/NetworkScorerPicker.java b/src/com/android/settings/network/NetworkScorerPicker.java index d9c20ffdf48..52e4ed98350 100644 --- a/src/com/android/settings/network/NetworkScorerPicker.java +++ b/src/com/android/settings/network/NetworkScorerPicker.java @@ -15,6 +15,7 @@ */ package com.android.settings.network; +import android.app.settings.SettingsEnums; import android.content.Context; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; @@ -28,7 +29,6 @@ import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.widget.RadioButtonPreference; @@ -45,7 +45,7 @@ public class NetworkScorerPicker extends InstrumentedPreferenceFragment implemen @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_NETWORK_SCORER; + return SettingsEnums.SETTINGS_NETWORK_SCORER; } @Override diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java index 322fdc432d0..1655c69cea4 100644 --- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java +++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java @@ -19,11 +19,10 @@ import static android.net.ConnectivityManager.PRIVATE_DNS_DEFAULT_MODE_FALLBACK; import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF; import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC; import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME; -import static android.system.OsConstants.AF_INET; -import static android.system.OsConstants.AF_INET6; import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; +import android.app.settings.SettingsEnums; import android.content.ActivityNotFoundException; import android.content.ContentResolver; import android.content.Context; @@ -33,7 +32,6 @@ import android.net.NetworkUtils; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import android.system.Os; import android.text.Editable; import android.text.TextWatcher; import android.text.method.LinkMovementMethod; @@ -49,7 +47,6 @@ import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; import androidx.preference.PreferenceViewHolder; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; import com.android.settings.utils.AnnotationSpan; @@ -203,7 +200,7 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat } FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context, - MetricsProto.MetricsEvent.ACTION_PRIVATE_DNS_MODE, mMode); + SettingsEnums.ACTION_PRIVATE_DNS_MODE, mMode); Settings.Global.putString(context.getContentResolver(), MODE_KEY, mMode); } } diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java index 37adea72b87..47c3a95c9fd 100644 --- a/src/com/android/settings/network/PrivateDnsPreferenceController.java +++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java @@ -45,11 +45,11 @@ import com.android.internal.util.ArrayUtils; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; +import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import com.android.settingslib.RestrictedLockUtilsInternal; -import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import java.net.InetAddress; import java.util.List; diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java index 6b14759b9fc..fbc6eddfe75 100644 --- a/src/com/android/settings/network/SubscriptionUtil.java +++ b/src/com/android/settings/network/SubscriptionUtil.java @@ -20,12 +20,12 @@ import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; + import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import androidx.annotation.VisibleForTesting; - public class SubscriptionUtil { private static List sResultsForTesting; diff --git a/src/com/android/settings/network/SubscriptionsPreferenceController.java b/src/com/android/settings/network/SubscriptionsPreferenceController.java index bf6d39c3d00..6952a1e9fbd 100644 --- a/src/com/android/settings/network/SubscriptionsPreferenceController.java +++ b/src/com/android/settings/network/SubscriptionsPreferenceController.java @@ -25,12 +25,6 @@ import android.provider.Settings; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; -import com.android.settings.R; -import com.android.settings.network.telephony.MobileNetworkActivity; -import com.android.settingslib.core.AbstractPreferenceController; - -import java.util.Map; - import androidx.collection.ArrayMap; import androidx.lifecycle.Lifecycle; import androidx.lifecycle.LifecycleObserver; @@ -39,6 +33,12 @@ import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; +import com.android.settings.R; +import com.android.settings.network.telephony.MobileNetworkActivity; +import com.android.settingslib.core.AbstractPreferenceController; + +import java.util.Map; + /** * This manages a set of Preferences it places into a PreferenceGroup owned by some parent * controller class - one for each available subscription. This controller is only considered diff --git a/src/com/android/settings/network/telephony/CarrierPreferenceController.java b/src/com/android/settings/network/telephony/CarrierPreferenceController.java index 3dab15e2a36..61232f56bc6 100644 --- a/src/com/android/settings/network/telephony/CarrierPreferenceController.java +++ b/src/com/android/settings/network/telephony/CarrierPreferenceController.java @@ -16,8 +16,8 @@ package com.android.settings.network.telephony; -import android.content.Context; import android.content.ComponentName; +import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; diff --git a/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java b/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java index 129ceb13712..75579dd0d74 100644 --- a/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java +++ b/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java @@ -26,7 +26,6 @@ import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.text.TextUtils; -import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import com.android.internal.telephony.PhoneConstants; diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java index d2ec162a423..fcd2fa049ca 100644 --- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java +++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.network.telephony; import android.content.Context; -import android.content.res.Resources; import android.os.PersistableBundle; import android.provider.Settings; import android.telephony.CarrierConfigManager; diff --git a/src/com/android/settings/network/telephony/EuiccPreferenceController.java b/src/com/android/settings/network/telephony/EuiccPreferenceController.java index 8d0390840dd..ae207a28636 100644 --- a/src/com/android/settings/network/telephony/EuiccPreferenceController.java +++ b/src/com/android/settings/network/telephony/EuiccPreferenceController.java @@ -18,9 +18,6 @@ package com.android.settings.network.telephony; import android.content.Context; import android.content.Intent; -import android.os.PersistableBundle; -import android.provider.Settings; -import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.telephony.euicc.EuiccManager; diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java index 3b9c8c0fead..c5cdd3a03ef 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java +++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java @@ -27,7 +27,6 @@ import android.database.Cursor; import android.os.PersistableBundle; import android.os.SystemProperties; import android.provider.Settings; -import android.service.carrier.CarrierMessagingService; import android.telecom.PhoneAccountHandle; import android.telecom.TelecomManager; import android.telephony.CarrierConfigManager; @@ -45,7 +44,6 @@ import com.android.ims.ImsException; import com.android.ims.ImsManager; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneConstants; -import com.android.settings.R; import java.util.Arrays; import java.util.List; diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java index 3b9b2f57190..ff04583d58c 100644 --- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java +++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java @@ -37,7 +37,6 @@ import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.OperatorInfo; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; @@ -162,7 +161,7 @@ public class NetworkSelectSettings extends DashboardFragment { mSelectedPreference.setSummary(R.string.network_connecting); mMetricsFeatureProvider.action(getContext(), - MetricsEvent.ACTION_MOBILE_NETWORK_MANUAL_SELECT_NETWORK); + SettingsEnums.ACTION_MOBILE_NETWORK_MANUAL_SELECT_NETWORK); // Set summary as "Disconnected" to the previously connected network if (mConnectedPreferenceCategory.getPreferenceCount() > 0) { diff --git a/src/com/android/settings/network/telephony/RoamingDialogFragment.java b/src/com/android/settings/network/telephony/RoamingDialogFragment.java index c349c1a47fa..c527d3c0021 100644 --- a/src/com/android/settings/network/telephony/RoamingDialogFragment.java +++ b/src/com/android/settings/network/telephony/RoamingDialogFragment.java @@ -26,9 +26,6 @@ import android.os.PersistableBundle; import android.telephony.CarrierConfigManager; import android.telephony.TelephonyManager; -import androidx.fragment.app.DialogFragment; -import androidx.fragment.app.Fragment; - import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java b/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java index 41bf3efc78c..c6538902385 100644 --- a/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java +++ b/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java @@ -19,13 +19,11 @@ package com.android.settings.network.telephony.cdma; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; -import android.telephony.TelephonyManager; import android.text.TextUtils; import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; -import androidx.preference.PreferenceManager; import com.android.internal.telephony.Phone; import com.android.settings.network.telephony.MobileNetworkUtils; diff --git a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java index 0e47d9bdb64..fdc9f7f23f6 100644 --- a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java +++ b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java @@ -31,7 +31,6 @@ import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settings.core.TogglePreferenceController; import com.android.settings.network.telephony.MobileNetworkUtils; -import com.android.settings.network.telephony.MobileNetworkActivity; import com.android.settings.network.telephony.NetworkSelectSettings; import java.util.ArrayList; diff --git a/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java b/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java index ab25e15f672..e8a392a9f38 100644 --- a/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java +++ b/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java @@ -32,7 +32,6 @@ import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.SubSettingLauncher; import com.android.settings.network.telephony.MobileNetworkUtils; -import com.android.settings.network.telephony.MobileNetworkActivity; import com.android.settings.network.telephony.NetworkSelectSettings; /** diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java index a157c7f52b1..1f75a2571ca 100644 --- a/src/com/android/settings/nfc/AndroidBeam.java +++ b/src/com/android/settings/nfc/AndroidBeam.java @@ -18,6 +18,7 @@ package com.android.settings.nfc; import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.pm.PackageManager; import android.nfc.NfcAdapter; @@ -33,7 +34,6 @@ import android.widget.ImageView; import android.widget.Switch; import android.widget.TextView; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.core.InstrumentedFragment; @@ -142,6 +142,6 @@ public class AndroidBeam extends InstrumentedFragment @Override public int getMetricsCategory() { - return MetricsEvent.NFC_BEAM; + return SettingsEnums.NFC_BEAM; } } diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java index e78c90de77c..5742d1a4fa7 100644 --- a/src/com/android/settings/nfc/PaymentSettings.java +++ b/src/com/android/settings/nfc/PaymentSettings.java @@ -16,6 +16,7 @@ package com.android.settings.nfc; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -30,7 +31,6 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -53,7 +53,7 @@ public class PaymentSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.NFC_PAYMENT; + return SettingsEnums.NFC_PAYMENT; } @Override diff --git a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java index 1499656eacf..58e19165104 100644 --- a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java +++ b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import android.app.AutomaticZenRule; import android.app.NotificationManager; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -31,7 +32,6 @@ import android.service.notification.ConditionProviderService; import androidx.fragment.app.Fragment; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -141,7 +141,7 @@ abstract public class AbstractZenModeAutomaticRulePreferenceController extends @Override public void onOk(String ruleName, Fragment parent) { mMetricsFeatureProvider.action(mContext, - MetricsProto.MetricsEvent.ACTION_ZEN_MODE_RULE_NAME_CHANGE_OK); + SettingsEnums.ACTION_ZEN_MODE_RULE_NAME_CHANGE_OK); AutomaticZenRule rule = new AutomaticZenRule(ruleName, mRuleInfo.serviceComponent, mRuleInfo.configurationActivity, mRuleInfo.defaultConditionId, null, NotificationManager.INTERRUPTION_FILTER_PRIORITY, true); diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java index c628da97844..6da31659294 100644 --- a/src/com/android/settings/notification/AppNotificationSettings.java +++ b/src/com/android/settings/notification/AppNotificationSettings.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import android.app.NotificationChannel; import android.app.NotificationChannelGroup; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.AsyncTask; import android.os.Bundle; @@ -30,7 +31,6 @@ import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.widget.MasterCheckBoxPreference; @@ -56,7 +56,7 @@ public class AppNotificationSettings extends NotificationSettingsBase { @Override public int getMetricsCategory() { - return MetricsEvent.NOTIFICATION_APP_NOTIFICATION; + return SettingsEnums.NOTIFICATION_APP_NOTIFICATION; } @Override diff --git a/src/com/android/settings/notification/ChannelGroupNotificationSettings.java b/src/com/android/settings/notification/ChannelGroupNotificationSettings.java index 17710c4c58e..1f8b1c3321f 100644 --- a/src/com/android/settings/notification/ChannelGroupNotificationSettings.java +++ b/src/com/android/settings/notification/ChannelGroupNotificationSettings.java @@ -17,12 +17,12 @@ package com.android.settings.notification; import android.app.NotificationChannel; +import android.app.settings.SettingsEnums; import android.content.Context; import android.util.Log; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; @@ -35,7 +35,7 @@ public class ChannelGroupNotificationSettings extends NotificationSettingsBase { @Override public int getMetricsCategory() { - return MetricsEvent.NOTIFICATION_CHANNEL_GROUP; + return SettingsEnums.NOTIFICATION_CHANNEL_GROUP; } @Override diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java index 3580967b461..0e1f386f4db 100644 --- a/src/com/android/settings/notification/ChannelNotificationSettings.java +++ b/src/com/android/settings/notification/ChannelNotificationSettings.java @@ -16,6 +16,7 @@ package com.android.settings.notification; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -25,7 +26,6 @@ import android.util.Log; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; @@ -38,7 +38,7 @@ public class ChannelNotificationSettings extends NotificationSettingsBase { @Override public int getMetricsCategory() { - return MetricsEvent.NOTIFICATION_TOPIC_NOTIFICATION; + return SettingsEnums.NOTIFICATION_TOPIC_NOTIFICATION; } @Override diff --git a/src/com/android/settings/notification/ChannelSummaryPreference.java b/src/com/android/settings/notification/ChannelSummaryPreference.java index c716038f60f..338e5e07848 100644 --- a/src/com/android/settings/notification/ChannelSummaryPreference.java +++ b/src/com/android/settings/notification/ChannelSummaryPreference.java @@ -21,11 +21,11 @@ import android.content.Intent; import android.view.View; import android.widget.CheckBox; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.TwoTargetPreference; -import androidx.preference.PreferenceViewHolder; - /** * A custom preference that provides inline checkbox and tappable target. */ diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java index 9da8ca1cec2..1b860e3b63c 100644 --- a/src/com/android/settings/notification/ConfigureNotificationSettings.java +++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import android.app.Activity; import android.app.Application; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -28,7 +29,6 @@ import androidx.annotation.VisibleForTesting; import androidx.fragment.app.Fragment; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.RingtonePreference; import com.android.settings.core.OnActivityResultListener; @@ -67,7 +67,7 @@ public class ConfigureNotificationSettings extends DashboardFragment implements @Override public int getMetricsCategory() { - return MetricsEvent.CONFIGURE_NOTIFICATION; + return SettingsEnums.CONFIGURE_NOTIFICATION; } @Override diff --git a/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java b/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java index 54a0d5e93cf..8677c0226da 100644 --- a/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java +++ b/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java @@ -17,12 +17,9 @@ package com.android.settings.notification; -import static com.android.internal.notification.NotificationAccessConfirmationActivityContract - .EXTRA_COMPONENT_NAME; -import static com.android.internal.notification.NotificationAccessConfirmationActivityContract - .EXTRA_PACKAGE_TITLE; -import static com.android.internal.notification.NotificationAccessConfirmationActivityContract - .EXTRA_USER_ID; +import static com.android.internal.notification.NotificationAccessConfirmationActivityContract.EXTRA_COMPONENT_NAME; +import static com.android.internal.notification.NotificationAccessConfirmationActivityContract.EXTRA_PACKAGE_TITLE; +import static com.android.internal.notification.NotificationAccessConfirmationActivityContract.EXTRA_USER_ID; import android.Manifest; import android.annotation.Nullable; diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java index 4d581bb22c2..81edc5b65dc 100644 --- a/src/com/android/settings/notification/NotificationAccessSettings.java +++ b/src/com/android/settings/notification/NotificationAccessSettings.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import android.app.Dialog; import android.app.NotificationManager; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; import android.os.AsyncTask; @@ -32,7 +33,6 @@ import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.overlay.FeatureFactory; @@ -77,7 +77,7 @@ public class NotificationAccessSettings extends ManagedServiceSettings { @Override public int getMetricsCategory() { - return MetricsEvent.NOTIFICATION_ACCESS; + return SettingsEnums.NOTIFICATION_ACCESS; } @Override @@ -132,8 +132,8 @@ public class NotificationAccessSettings extends ManagedServiceSettings { @VisibleForTesting void logSpecialPermissionChange(boolean enable, String packageName) { - int logCategory = enable ? MetricsEvent.APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW - : MetricsEvent.APP_SPECIAL_PERMISSION_NOTIVIEW_DENY; + int logCategory = enable ? SettingsEnums.APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW + : SettingsEnums.APP_SPECIAL_PERMISSION_NOTIVIEW_DENY; FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider().action(getContext(), logCategory, packageName); } @@ -164,7 +164,7 @@ public class NotificationAccessSettings extends ManagedServiceSettings { @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_DISABLE_NOTIFICATION_ACCESS; + return SettingsEnums.DIALOG_DISABLE_NOTIFICATION_ACCESS; } @Override diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java index d5fea09598b..a2be3eafb3a 100644 --- a/src/com/android/settings/notification/NotificationBackend.java +++ b/src/com/android/settings/notification/NotificationBackend.java @@ -21,7 +21,6 @@ import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; import android.app.INotificationManager; import android.app.NotificationChannel; import android.app.NotificationChannelGroup; -import android.app.NotificationManager; import android.app.usage.IUsageStatsManager; import android.app.usage.UsageEvents; import android.content.Context; @@ -39,6 +38,8 @@ import android.text.format.DateUtils; import android.util.IconDrawableFactory; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settingslib.R; import com.android.settingslib.Utils; import com.android.settingslib.utils.StringUtil; @@ -48,8 +49,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import androidx.annotation.VisibleForTesting; - public class NotificationBackend { private static final String TAG = "NotificationBackend"; diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java index 7053bb341e2..0b79e20fd78 100644 --- a/src/com/android/settings/notification/NotificationSettingsBase.java +++ b/src/com/android/settings/notification/NotificationSettingsBase.java @@ -50,7 +50,6 @@ import com.android.settings.SettingsActivity; import com.android.settings.applications.AppInfoBase; import com.android.settings.core.SubSettingLauncher; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.widget.MasterCheckBoxPreference; import com.android.settingslib.RestrictedLockUtilsInternal; import java.util.ArrayList; diff --git a/src/com/android/settings/notification/NotificationStation.java b/src/com/android/settings/notification/NotificationStation.java index 91ebc887961..ee6a05b79ba 100644 --- a/src/com/android/settings/notification/NotificationStation.java +++ b/src/com/android/settings/notification/NotificationStation.java @@ -24,6 +24,7 @@ import android.app.INotificationManager; import android.app.Notification; import android.app.NotificationChannel; import android.app.PendingIntent; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; import android.content.IntentSender; @@ -56,7 +57,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; import androidx.recyclerview.widget.RecyclerView; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; @@ -183,7 +183,7 @@ public class NotificationStation extends SettingsPreferenceFragment { @Override public int getMetricsCategory() { - return MetricsEvent.NOTIFICATION_STATION; + return SettingsEnums.NOTIFICATION_STATION; } @Override diff --git a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java index bbc01f50104..1c8c88ed291 100644 --- a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java +++ b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.app.Application; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -35,7 +36,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.AppInfoBase; import com.android.settings.core.PreferenceControllerMixin; @@ -47,7 +47,6 @@ import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.utils.StringUtil; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; @@ -213,7 +212,7 @@ public class RecentNotifyingAppsPreferenceController extends AbstractPreferenceC .setTitleRes(R.string.notifications_title) .setArguments(args) .setSourceMetricsCategory( - MetricsProto.MetricsEvent.MANAGE_APPLICATIONS_NOTIFICATIONS) + SettingsEnums.MANAGE_APPLICATIONS_NOTIFICATIONS) .toIntent()); pref.setEnabled(mNotificationBackend.isBlockable(mContext, appEntry.info)); pref.setOnPreferenceChangeListener((preference, newValue) -> { diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java index 11861e0c6d7..cc26f8af04b 100644 --- a/src/com/android/settings/notification/RedactionInterstitial.java +++ b/src/com/android/settings/notification/RedactionInterstitial.java @@ -23,6 +23,7 @@ import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS; import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.res.Resources; @@ -37,7 +38,6 @@ import android.widget.RadioButton; import android.widget.RadioGroup; import android.widget.TextView; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.RestrictedRadioButton; import com.android.settings.SettingsActivity; @@ -102,7 +102,7 @@ public class RedactionInterstitial extends SettingsActivity { @Override public int getMetricsCategory() { - return MetricsEvent.NOTIFICATION_REDACTION; + return SettingsEnums.NOTIFICATION_REDACTION; } @Override diff --git a/src/com/android/settings/notification/SettingsEnableZenModeDialog.java b/src/com/android/settings/notification/SettingsEnableZenModeDialog.java index dccdc26e880..880db35b59c 100644 --- a/src/com/android/settings/notification/SettingsEnableZenModeDialog.java +++ b/src/com/android/settings/notification/SettingsEnableZenModeDialog.java @@ -17,9 +17,9 @@ package com.android.settings.notification; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.os.Bundle; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; public class SettingsEnableZenModeDialog extends InstrumentedDialogFragment { @@ -32,6 +32,6 @@ public class SettingsEnableZenModeDialog extends InstrumentedDialogFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.NOTIFICATION_ZEN_MODE_ENABLE_DIALOG; + return SettingsEnums.NOTIFICATION_ZEN_MODE_ENABLE_DIALOG; } } diff --git a/src/com/android/settings/notification/SettingsZenDurationDialog.java b/src/com/android/settings/notification/SettingsZenDurationDialog.java index 23bf1a971f5..355d4836b0b 100644 --- a/src/com/android/settings/notification/SettingsZenDurationDialog.java +++ b/src/com/android/settings/notification/SettingsZenDurationDialog.java @@ -17,9 +17,9 @@ package com.android.settings.notification; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.os.Bundle; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; public class SettingsZenDurationDialog extends InstrumentedDialogFragment { @@ -32,6 +32,6 @@ public class SettingsZenDurationDialog extends InstrumentedDialogFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.NOTIFICATION_ZEN_MODE_DURATION_DIALOG; + return SettingsEnums.NOTIFICATION_ZEN_MODE_DURATION_DIALOG; } } diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java index 99fd3d58954..e8b7ee0d782 100644 --- a/src/com/android/settings/notification/SoundSettings.java +++ b/src/com/android/settings/notification/SoundSettings.java @@ -16,6 +16,7 @@ package com.android.settings.notification; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -31,8 +32,6 @@ import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.RingtonePreference; import com.android.settings.core.OnActivityResultListener; @@ -83,7 +82,7 @@ public class SoundSettings extends DashboardFragment implements OnActivityResult @Override public int getMetricsCategory() { - return MetricsEvent.SOUND; + return SettingsEnums.SOUND; } @Override @@ -132,9 +131,9 @@ public class SoundSettings extends DashboardFragment implements OnActivityResult public void onDisplayPreferenceDialog(Preference preference) { final int metricsCategory; if (mHfpOutputControllerKey.equals(preference.getKey())) { - metricsCategory = MetricsProto.MetricsEvent.DIALOG_SWITCH_HFP_DEVICES; + metricsCategory = SettingsEnums.DIALOG_SWITCH_HFP_DEVICES; } else if (mMediaOutputControllerKey.equals(preference.getKey())) { - metricsCategory = MetricsProto.MetricsEvent.DIALOG_SWITCH_A2DP_DEVICES; + metricsCategory = SettingsEnums.DIALOG_SWITCH_A2DP_DEVICES; } else { metricsCategory = Instrumentable.METRICS_CATEGORY_UNKNOWN; } diff --git a/src/com/android/settings/notification/WorkSoundPreferenceController.java b/src/com/android/settings/notification/WorkSoundPreferenceController.java index b640d5a247e..c708b370fa3 100644 --- a/src/com/android/settings/notification/WorkSoundPreferenceController.java +++ b/src/com/android/settings/notification/WorkSoundPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import android.annotation.UserIdInt; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.Context; import android.content.DialogInterface; @@ -40,7 +41,6 @@ import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.DefaultRingtonePreference; import com.android.settings.R; import com.android.settings.Utils; @@ -331,7 +331,7 @@ public class WorkSoundPreferenceController extends AbstractPreferenceController @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_UNIFY_SOUND_SETTINGS; + return SettingsEnums.DIALOG_UNIFY_SOUND_SETTINGS; } @Override diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java index 70c7150c0eb..d057c755754 100644 --- a/src/com/android/settings/notification/ZenAccessSettings.java +++ b/src/com/android/settings/notification/ZenAccessSettings.java @@ -21,6 +21,7 @@ import android.app.ActivityManager; import android.app.AppGlobals; import android.app.Dialog; import android.app.NotificationManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.content.pm.ApplicationInfo; @@ -49,7 +50,6 @@ import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.overlay.FeatureFactory; @@ -74,7 +74,7 @@ public class ZenAccessSettings extends EmptyTextSettings { @Override public int getMetricsCategory() { - return MetricsEvent.NOTIFICATION_ZEN_MODE_ACCESS; + return SettingsEnums.NOTIFICATION_ZEN_MODE_ACCESS; } @Override @@ -211,8 +211,8 @@ public class ZenAccessSettings extends EmptyTextSettings { @VisibleForTesting static void logSpecialPermissionChange(boolean enable, String packageName, Context context) { - int logCategory = enable ? MetricsEvent.APP_SPECIAL_PERMISSION_DND_ALLOW - : MetricsEvent.APP_SPECIAL_PERMISSION_DND_DENY; + int logCategory = enable ? SettingsEnums.APP_SPECIAL_PERMISSION_DND_ALLOW + : SettingsEnums.APP_SPECIAL_PERMISSION_DND_DENY; FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context, logCategory, packageName); } @@ -248,7 +248,7 @@ public class ZenAccessSettings extends EmptyTextSettings { @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_ZEN_ACCESS_GRANT; + return SettingsEnums.DIALOG_ZEN_ACCESS_GRANT; } public ScaryWarningDialogFragment setPkgInfo(String pkg, CharSequence label) { @@ -300,7 +300,7 @@ public class ZenAccessSettings extends EmptyTextSettings { @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_ZEN_ACCESS_REVOKE; + return SettingsEnums.DIALOG_ZEN_ACCESS_REVOKE; } public FriendlyWarningDialogFragment setPkgInfo(String pkg, CharSequence label) { diff --git a/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java b/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java index 5fa3954f7ac..73a03cbb3c5 100644 --- a/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java +++ b/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java @@ -24,15 +24,12 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.service.notification.ZenModeConfig; -import android.text.TextUtils; import android.util.Slog; import android.view.View; -import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.widget.EntityHeaderController; diff --git a/src/com/android/settings/notification/ZenCustomRuleBlockedEffectsSettings.java b/src/com/android/settings/notification/ZenCustomRuleBlockedEffectsSettings.java index 3f75a20ff45..b4074451525 100644 --- a/src/com/android/settings/notification/ZenCustomRuleBlockedEffectsSettings.java +++ b/src/com/android/settings/notification/ZenCustomRuleBlockedEffectsSettings.java @@ -16,11 +16,11 @@ package com.android.settings.notification; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.service.notification.ZenPolicy; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; @@ -46,26 +46,26 @@ public class ZenCustomRuleBlockedEffectsSettings extends ZenCustomRuleSettingsBa mControllers = new ArrayList<>(); mControllers.add(new ZenRuleVisEffectPreferenceController(context, getSettingsLifecycle(), "zen_effect_intent", ZenPolicy.VISUAL_EFFECT_FULL_SCREEN_INTENT, - MetricsEvent.ACTION_ZEN_BLOCK_FULL_SCREEN_INTENTS, null)); + SettingsEnums.ACTION_ZEN_BLOCK_FULL_SCREEN_INTENTS, null)); mControllers.add(new ZenRuleVisEffectPreferenceController(context, getSettingsLifecycle(), "zen_effect_light", ZenPolicy.VISUAL_EFFECT_LIGHTS, - MetricsEvent.ACTION_ZEN_BLOCK_LIGHT, null)); + SettingsEnums.ACTION_ZEN_BLOCK_LIGHT, null)); mControllers.add(new ZenRuleVisEffectPreferenceController(context, getSettingsLifecycle(), "zen_effect_peek", ZenPolicy.VISUAL_EFFECT_PEEK, - MetricsEvent.ACTION_ZEN_BLOCK_PEEK, null)); + SettingsEnums.ACTION_ZEN_BLOCK_PEEK, null)); mControllers.add(new ZenRuleVisEffectPreferenceController(context, getSettingsLifecycle(), "zen_effect_status", ZenPolicy.VISUAL_EFFECT_STATUS_BAR, - MetricsEvent.ACTION_ZEN_BLOCK_STATUS, + SettingsEnums.ACTION_ZEN_BLOCK_STATUS, new int[] {ZenPolicy.VISUAL_EFFECT_NOTIFICATION_LIST})); mControllers.add(new ZenRuleVisEffectPreferenceController(context, getSettingsLifecycle(), "zen_effect_badge", ZenPolicy.VISUAL_EFFECT_BADGE, - MetricsEvent.ACTION_ZEN_BLOCK_BADGE, null)); + SettingsEnums.ACTION_ZEN_BLOCK_BADGE, null)); mControllers.add(new ZenRuleVisEffectPreferenceController(context, getSettingsLifecycle(), "zen_effect_ambient", ZenPolicy.VISUAL_EFFECT_AMBIENT, - MetricsEvent.ACTION_ZEN_BLOCK_AMBIENT, null)); + SettingsEnums.ACTION_ZEN_BLOCK_AMBIENT, null)); mControllers.add(new ZenRuleVisEffectPreferenceController(context, getSettingsLifecycle(), "zen_effect_list", ZenPolicy.VISUAL_EFFECT_NOTIFICATION_LIST, - MetricsEvent.ACTION_ZEN_BLOCK_NOTIFICATION_LIST, null)); + SettingsEnums.ACTION_ZEN_BLOCK_NOTIFICATION_LIST, null)); return mControllers; } @@ -76,6 +76,6 @@ public class ZenCustomRuleBlockedEffectsSettings extends ZenCustomRuleSettingsBa @Override public int getMetricsCategory() { - return MetricsEvent.ZEN_CUSTOM_RULE_VIS_EFFECTS; + return SettingsEnums.ZEN_CUSTOM_RULE_VIS_EFFECTS; } } diff --git a/src/com/android/settings/notification/ZenCustomRuleCallsSettings.java b/src/com/android/settings/notification/ZenCustomRuleCallsSettings.java index 808264e0ad5..42e62c34db3 100644 --- a/src/com/android/settings/notification/ZenCustomRuleCallsSettings.java +++ b/src/com/android/settings/notification/ZenCustomRuleCallsSettings.java @@ -16,6 +16,7 @@ package com.android.settings.notification; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.service.notification.ZenPolicy; @@ -23,7 +24,6 @@ import android.service.notification.ZenPolicy; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.widget.FooterPreference; @@ -49,7 +49,7 @@ public class ZenCustomRuleCallsSettings extends ZenCustomRuleSettingsBase { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.ZEN_CUSTOM_RULE_CALLS; + return SettingsEnums.ZEN_CUSTOM_RULE_CALLS; } @Override diff --git a/src/com/android/settings/notification/ZenCustomRuleConfigSettings.java b/src/com/android/settings/notification/ZenCustomRuleConfigSettings.java index fd8ce2be2e1..c39b4d500a0 100644 --- a/src/com/android/settings/notification/ZenCustomRuleConfigSettings.java +++ b/src/com/android/settings/notification/ZenCustomRuleConfigSettings.java @@ -17,13 +17,13 @@ package com.android.settings.notification; import android.app.NotificationManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.service.notification.ZenPolicy; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settingslib.core.AbstractPreferenceController; @@ -60,7 +60,7 @@ public class ZenCustomRuleConfigSettings extends ZenCustomRuleSettingsBase { new SubSettingLauncher(mContext) .setDestination(ZenCustomRuleCallsSettings.class.getName()) .setArguments(createZenRuleBundle()) - .setSourceMetricsCategory(MetricsEvent.ZEN_CUSTOM_RULE_CALLS) + .setSourceMetricsCategory(SettingsEnums.ZEN_CUSTOM_RULE_CALLS) .launch(); return true; } @@ -74,7 +74,7 @@ public class ZenCustomRuleConfigSettings extends ZenCustomRuleSettingsBase { new SubSettingLauncher(mContext) .setDestination(ZenCustomRuleMessagesSettings.class.getName()) .setArguments(createZenRuleBundle()) - .setSourceMetricsCategory(MetricsEvent.ZEN_CUSTOM_RULE_MESSAGES) + .setSourceMetricsCategory(SettingsEnums.ZEN_CUSTOM_RULE_MESSAGES) .launch(); return true; } @@ -89,7 +89,7 @@ public class ZenCustomRuleConfigSettings extends ZenCustomRuleSettingsBase { .setDestination(ZenCustomRuleNotificationsSettings.class.getName()) .setArguments(createZenRuleBundle()) .setSourceMetricsCategory - (MetricsEvent.ZEN_CUSTOM_RULE_NOTIFICATION_RESTRICTIONS) + (SettingsEnums.ZEN_CUSTOM_RULE_NOTIFICATION_RESTRICTIONS) .launch(); return true; } @@ -123,7 +123,7 @@ public class ZenCustomRuleConfigSettings extends ZenCustomRuleSettingsBase { @Override public int getMetricsCategory() { - return MetricsEvent.ZEN_CUSTOM_RULE_SOUND_SETTINGS; + return SettingsEnums.ZEN_CUSTOM_RULE_SOUND_SETTINGS; } @Override @@ -131,19 +131,19 @@ public class ZenCustomRuleConfigSettings extends ZenCustomRuleSettingsBase { mControllers = new ArrayList<>(); mControllers.add(new ZenRuleCustomSwitchPreferenceController(context, getSettingsLifecycle(), ALARMS_KEY, ZenPolicy.PRIORITY_CATEGORY_ALARMS, - MetricsEvent.ACTION_ZEN_ALLOW_ALARMS)); + SettingsEnums.ACTION_ZEN_ALLOW_ALARMS)); mControllers.add(new ZenRuleCustomSwitchPreferenceController(context, getSettingsLifecycle(), MEDIA_KEY, ZenPolicy.PRIORITY_CATEGORY_MEDIA, - MetricsEvent.ACTION_ZEN_ALLOW_MEDIA)); + SettingsEnums.ACTION_ZEN_ALLOW_MEDIA)); mControllers.add(new ZenRuleCustomSwitchPreferenceController(context, getSettingsLifecycle(), SYSTEM_KEY, ZenPolicy.PRIORITY_CATEGORY_SYSTEM, - MetricsEvent.ACTION_ZEN_ALLOW_SYSTEM)); + SettingsEnums.ACTION_ZEN_ALLOW_SYSTEM)); mControllers.add(new ZenRuleCustomSwitchPreferenceController(context, getSettingsLifecycle(), REMINDERS_KEY, ZenPolicy.PRIORITY_CATEGORY_REMINDERS, - MetricsEvent.ACTION_ZEN_ALLOW_REMINDERS)); + SettingsEnums.ACTION_ZEN_ALLOW_REMINDERS)); mControllers.add(new ZenRuleCustomSwitchPreferenceController(context, getSettingsLifecycle(), EVENTS_KEY, ZenPolicy.PRIORITY_CATEGORY_EVENTS, - MetricsEvent.ACTION_ZEN_ALLOW_EVENTS)); + SettingsEnums.ACTION_ZEN_ALLOW_EVENTS)); return mControllers; } diff --git a/src/com/android/settings/notification/ZenCustomRuleMessagesSettings.java b/src/com/android/settings/notification/ZenCustomRuleMessagesSettings.java index 8db2824efaf..746dff3fab1 100644 --- a/src/com/android/settings/notification/ZenCustomRuleMessagesSettings.java +++ b/src/com/android/settings/notification/ZenCustomRuleMessagesSettings.java @@ -16,13 +16,13 @@ package com.android.settings.notification; +import android.app.settings.SettingsEnums; import android.content.Context; import android.service.notification.ZenPolicy; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.widget.FooterPreference; @@ -42,7 +42,7 @@ public class ZenCustomRuleMessagesSettings extends ZenCustomRuleSettingsBase { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.ZEN_CUSTOM_RULE_MESSAGES; + return SettingsEnums.ZEN_CUSTOM_RULE_MESSAGES; } @Override diff --git a/src/com/android/settings/notification/ZenCustomRuleNotificationsSettings.java b/src/com/android/settings/notification/ZenCustomRuleNotificationsSettings.java index a23bc6dd7c7..9d7d5a3e750 100644 --- a/src/com/android/settings/notification/ZenCustomRuleNotificationsSettings.java +++ b/src/com/android/settings/notification/ZenCustomRuleNotificationsSettings.java @@ -16,9 +16,9 @@ package com.android.settings.notification; +import android.app.settings.SettingsEnums; import android.content.Context; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.widget.FooterPreference; @@ -58,6 +58,6 @@ public class ZenCustomRuleNotificationsSettings extends ZenCustomRuleSettingsBas @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.ZEN_CUSTOM_RULE_NOTIFICATION_RESTRICTIONS; + return SettingsEnums.ZEN_CUSTOM_RULE_NOTIFICATION_RESTRICTIONS; } } diff --git a/src/com/android/settings/notification/ZenCustomRuleSettings.java b/src/com/android/settings/notification/ZenCustomRuleSettings.java index ebd63064ccd..d7ca8c01e15 100644 --- a/src/com/android/settings/notification/ZenCustomRuleSettings.java +++ b/src/com/android/settings/notification/ZenCustomRuleSettings.java @@ -16,9 +16,9 @@ package com.android.settings.notification; +import android.app.settings.SettingsEnums; import android.content.Context; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; @@ -37,7 +37,7 @@ public class ZenCustomRuleSettings extends ZenCustomRuleSettingsBase { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.ZEN_CUSTOM_RULE_SETTINGS; + return SettingsEnums.ZEN_CUSTOM_RULE_SETTINGS; } @Override diff --git a/src/com/android/settings/notification/ZenDeleteRuleDialog.java b/src/com/android/settings/notification/ZenDeleteRuleDialog.java index 804196edccb..694fcbac0a2 100644 --- a/src/com/android/settings/notification/ZenDeleteRuleDialog.java +++ b/src/com/android/settings/notification/ZenDeleteRuleDialog.java @@ -17,18 +17,18 @@ package com.android.settings.notification; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.os.Bundle; import android.text.BidiFormatter; import android.view.View; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.R; -import com.android.settings.core.instrumentation.InstrumentedDialogFragment; - import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; +import com.android.settings.R; +import com.android.settings.core.instrumentation.InstrumentedDialogFragment; + public class ZenDeleteRuleDialog extends InstrumentedDialogFragment { protected static final String TAG = "ZenDeleteRuleDialog"; private static final String EXTRA_ZEN_RULE_NAME = "zen_rule_name"; @@ -58,7 +58,7 @@ public class ZenDeleteRuleDialog extends InstrumentedDialogFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.NOTIFICATION_ZEN_MODE_DELETE_RULE_DIALOG; + return SettingsEnums.NOTIFICATION_ZEN_MODE_DELETE_RULE_DIALOG; } @Override diff --git a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java b/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java index b8776683971..00e97364990 100644 --- a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.Settings; import android.util.Log; @@ -24,7 +25,6 @@ import android.util.Log; import androidx.preference.Preference; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; public class ZenModeAlarmsPreferenceController extends @@ -75,7 +75,7 @@ public class ZenModeAlarmsPreferenceController extends Log.d(TAG, "onPrefChange allowAlarms=" + allowAlarms); } - mMetricsFeatureProvider.action(mContext, MetricsProto.MetricsEvent.ACTION_ZEN_ALLOW_ALARMS, + mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ZEN_ALLOW_ALARMS, allowAlarms); mBackend.saveSoundPolicy(Policy.PRIORITY_CATEGORY_ALARMS, allowAlarms); diff --git a/src/com/android/settings/notification/ZenModeAllBypassingAppsPreferenceController.java b/src/com/android/settings/notification/ZenModeAllBypassingAppsPreferenceController.java index 5539ba4e6a2..ee7868cfe5e 100644 --- a/src/com/android/settings/notification/ZenModeAllBypassingAppsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAllBypassingAppsPreferenceController.java @@ -18,11 +18,17 @@ package com.android.settings.notification; import android.app.Application; import android.app.NotificationChannel; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.provider.Settings; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import androidx.annotation.VisibleForTesting; +import androidx.core.text.BidiFormatter; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.AppInfoBase; import com.android.settings.core.PreferenceControllerMixin; @@ -34,13 +40,6 @@ import com.android.settingslib.widget.apppreference.AppPreference; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.core.text.BidiFormatter; -import androidx.fragment.app.Fragment; -import androidx.lifecycle.Lifecycle; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * Adds a preference to the PreferenceScreen for each notification channel that can bypass DND. */ @@ -139,7 +138,7 @@ public class ZenModeAllBypassingAppsPreferenceController extends AbstractPrefere .setTitleRes(R.string.notification_channel_title) .setResultListener(mHostFragment, 0) .setSourceMetricsCategory( - MetricsEvent.NOTIFICATION_ZEN_MODE_OVERRIDING_APP) + SettingsEnums.NOTIFICATION_ZEN_MODE_OVERRIDING_APP) .launch(); return true; } diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java index 57ee545292b..0f879071de1 100644 --- a/src/com/android/settings/notification/ZenModeAutomationSettings.java +++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java @@ -19,6 +19,7 @@ package com.android.settings.notification; import android.app.AlertDialog; import android.app.AutomaticZenRule; import android.app.NotificationManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; @@ -30,7 +31,6 @@ import android.view.MenuItem; import androidx.fragment.app.Fragment; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -86,7 +86,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase { @Override public int getMetricsCategory() { - return MetricsEvent.NOTIFICATION_ZEN_MODE_AUTOMATION; + return SettingsEnums.NOTIFICATION_ZEN_MODE_AUTOMATION; } protected static ManagedServiceSettings.Config getConditionProviderConfig() { diff --git a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java b/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java index 6c7477a13af..613bd355c00 100644 --- a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java +++ b/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java @@ -24,11 +24,11 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_NOTIFICAT import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -59,26 +59,26 @@ public class ZenModeBlockedEffectsSettings extends ZenModeSettingsBase implement List controllers = new ArrayList<>(); controllers.add(new ZenModeVisEffectPreferenceController(context, lifecycle, "zen_effect_intent", SUPPRESSED_EFFECT_FULL_SCREEN_INTENT, - MetricsEvent.ACTION_ZEN_BLOCK_FULL_SCREEN_INTENTS, null)); + SettingsEnums.ACTION_ZEN_BLOCK_FULL_SCREEN_INTENTS, null)); controllers.add(new ZenModeVisEffectPreferenceController(context, lifecycle, "zen_effect_light", SUPPRESSED_EFFECT_LIGHTS, - MetricsEvent.ACTION_ZEN_BLOCK_LIGHT, null)); + SettingsEnums.ACTION_ZEN_BLOCK_LIGHT, null)); controllers.add(new ZenModeVisEffectPreferenceController(context, lifecycle, "zen_effect_peek", SUPPRESSED_EFFECT_PEEK, - MetricsEvent.ACTION_ZEN_BLOCK_PEEK, null)); + SettingsEnums.ACTION_ZEN_BLOCK_PEEK, null)); controllers.add(new ZenModeVisEffectPreferenceController(context, lifecycle, "zen_effect_status", SUPPRESSED_EFFECT_STATUS_BAR, - MetricsEvent.ACTION_ZEN_BLOCK_STATUS, + SettingsEnums.ACTION_ZEN_BLOCK_STATUS, new int[] {SUPPRESSED_EFFECT_NOTIFICATION_LIST})); controllers.add(new ZenModeVisEffectPreferenceController(context, lifecycle, "zen_effect_badge", SUPPRESSED_EFFECT_BADGE, - MetricsEvent.ACTION_ZEN_BLOCK_BADGE, null)); + SettingsEnums.ACTION_ZEN_BLOCK_BADGE, null)); controllers.add(new ZenModeVisEffectPreferenceController(context, lifecycle, "zen_effect_ambient", SUPPRESSED_EFFECT_AMBIENT, - MetricsEvent.ACTION_ZEN_BLOCK_AMBIENT, null)); + SettingsEnums.ACTION_ZEN_BLOCK_AMBIENT, null)); controllers.add(new ZenModeVisEffectPreferenceController(context, lifecycle, "zen_effect_list", SUPPRESSED_EFFECT_NOTIFICATION_LIST, - MetricsEvent.ACTION_ZEN_BLOCK_NOTIFICATION_LIST, null)); + SettingsEnums.ACTION_ZEN_BLOCK_NOTIFICATION_LIST, null)); return controllers; } @@ -89,7 +89,7 @@ public class ZenModeBlockedEffectsSettings extends ZenModeSettingsBase implement @Override public int getMetricsCategory() { - return MetricsEvent.ZEN_WHAT_TO_BLOCK; + return SettingsEnums.ZEN_WHAT_TO_BLOCK; } /** diff --git a/src/com/android/settings/notification/ZenModeButtonPreferenceController.java b/src/com/android/settings/notification/ZenModeButtonPreferenceController.java index 8ebc6b8ab54..4829a289584 100644 --- a/src/com/android/settings/notification/ZenModeButtonPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeButtonPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.notification; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.Settings; import android.view.View; @@ -24,7 +25,6 @@ import android.widget.Button; import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -70,7 +70,7 @@ public class ZenModeButtonPreferenceController extends AbstractZenModePreference .findViewById(R.id.zen_mode_settings_turn_off_button); mZenButtonOff.setOnClickListener(v -> { mMetricsFeatureProvider.action(mContext, - MetricsProto.MetricsEvent.ACTION_ZEN_TOGGLE_DND_BUTTON, false); + SettingsEnums.ACTION_ZEN_TOGGLE_DND_BUTTON, false); mBackend.setZenMode(Settings.Global.ZEN_MODE_OFF); }); } @@ -100,21 +100,21 @@ public class ZenModeButtonPreferenceController extends AbstractZenModePreference case Settings.Secure.ZEN_DURATION_PROMPT: mZenButtonOn.setOnClickListener(v -> { mMetricsFeatureProvider.action(mContext, - MetricsProto.MetricsEvent.ACTION_ZEN_TOGGLE_DND_BUTTON, false); + SettingsEnums.ACTION_ZEN_TOGGLE_DND_BUTTON, false); new SettingsEnableZenModeDialog().show(mFragment, TAG); }); break; case Settings.Secure.ZEN_DURATION_FOREVER: mZenButtonOn.setOnClickListener(v -> { mMetricsFeatureProvider.action(mContext, - MetricsProto.MetricsEvent.ACTION_ZEN_TOGGLE_DND_BUTTON, false); + SettingsEnums.ACTION_ZEN_TOGGLE_DND_BUTTON, false); mBackend.setZenMode(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS); }); break; default: mZenButtonOn.setOnClickListener(v -> { mMetricsFeatureProvider.action(mContext, - MetricsProto.MetricsEvent.ACTION_ZEN_TOGGLE_DND_BUTTON, false); + SettingsEnums.ACTION_ZEN_TOGGLE_DND_BUTTON, false); mBackend.setZenModeForDuration(zenDuration); }); } diff --git a/src/com/android/settings/notification/ZenModeBypassingAppsSettings.java b/src/com/android/settings/notification/ZenModeBypassingAppsSettings.java index 53dc8d1bb6f..455de427ce4 100644 --- a/src/com/android/settings/notification/ZenModeBypassingAppsSettings.java +++ b/src/com/android/settings/notification/ZenModeBypassingAppsSettings.java @@ -18,10 +18,12 @@ package com.android.settings.notification; import android.app.Activity; import android.app.Application; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import androidx.fragment.app.Fragment; + import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -31,8 +33,6 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; -import androidx.fragment.app.Fragment; - @SearchIndexable public class ZenModeBypassingAppsSettings extends ZenModeSettingsBase implements Indexable { @@ -69,7 +69,7 @@ public class ZenModeBypassingAppsSettings extends ZenModeSettingsBase implements @Override public int getMetricsCategory() { - return MetricsEvent.NOTIFICATION_ZEN_MODE_OVERRIDING_APPS; + return SettingsEnums.NOTIFICATION_ZEN_MODE_OVERRIDING_APPS; } /** diff --git a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java index 5bacafbec04..0a8b931122f 100644 --- a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java @@ -18,11 +18,11 @@ package com.android.settings.notification; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; -import androidx.preference.Preference; - public class ZenModeCallsPreferenceController extends AbstractZenModePreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/ZenModeCallsSettings.java b/src/com/android/settings/notification/ZenModeCallsSettings.java index fa77bb04a39..a1d0ec7e409 100644 --- a/src/com/android/settings/notification/ZenModeCallsSettings.java +++ b/src/com/android/settings/notification/ZenModeCallsSettings.java @@ -18,10 +18,10 @@ package com.android.settings.notification; import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_CALLS; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -61,7 +61,7 @@ public class ZenModeCallsSettings extends ZenModeSettingsBase implements Indexab @Override public int getMetricsCategory() { - return MetricsEvent.NOTIFICATION_ZEN_MODE_PRIORITY; + return SettingsEnums.NOTIFICATION_ZEN_MODE_PRIORITY; } /** diff --git a/src/com/android/settings/notification/ZenModeEventRuleSettings.java b/src/com/android/settings/notification/ZenModeEventRuleSettings.java index ee3ed1cbc40..4a1a34290b1 100644 --- a/src/com/android/settings/notification/ZenModeEventRuleSettings.java +++ b/src/com/android/settings/notification/ZenModeEventRuleSettings.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.app.AutomaticZenRule; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.pm.PackageManager.NameNotFoundException; import android.database.Cursor; @@ -33,7 +34,6 @@ import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceScreen; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; @@ -180,7 +180,7 @@ public class ZenModeEventRuleSettings extends ZenModeRuleSettingsBase { @Override public int getMetricsCategory() { - return MetricsEvent.NOTIFICATION_ZEN_MODE_EVENT_RULE; + return SettingsEnums.NOTIFICATION_ZEN_MODE_EVENT_RULE; } private List getCalendars(Context context) { diff --git a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java b/src/com/android/settings/notification/ZenModeEventsPreferenceController.java index 235ebd5b004..9a45a903474 100644 --- a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeEventsPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.Settings; import android.util.Log; @@ -24,7 +25,6 @@ import android.util.Log; import androidx.preference.Preference; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; public class ZenModeEventsPreferenceController extends AbstractZenModePreferenceController @@ -70,7 +70,7 @@ public class ZenModeEventsPreferenceController extends AbstractZenModePreference if (ZenModeSettingsBase.DEBUG) { Log.d(TAG, "onPrefChange allowEvents=" + allowEvents); } - mMetricsFeatureProvider.action(mContext, MetricsProto.MetricsEvent.ACTION_ZEN_ALLOW_EVENTS, + mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ZEN_ALLOW_EVENTS, allowEvents); mBackend.saveSoundPolicy(Policy.PRIORITY_CATEGORY_EVENTS, allowEvents); return true; diff --git a/src/com/android/settings/notification/ZenModeMessagesSettings.java b/src/com/android/settings/notification/ZenModeMessagesSettings.java index e09d5839084..a03d088f308 100644 --- a/src/com/android/settings/notification/ZenModeMessagesSettings.java +++ b/src/com/android/settings/notification/ZenModeMessagesSettings.java @@ -18,10 +18,10 @@ package com.android.settings.notification; import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -58,7 +58,7 @@ public class ZenModeMessagesSettings extends ZenModeSettingsBase implements Inde @Override public int getMetricsCategory() { - return MetricsEvent.NOTIFICATION_ZEN_MODE_PRIORITY; + return SettingsEnums.NOTIFICATION_ZEN_MODE_PRIORITY; } /** diff --git a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java b/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java index 41f1eb1c6ec..8e64be3d4d6 100644 --- a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.app.NotificationManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.Settings; import android.util.Log; @@ -24,7 +25,6 @@ import android.util.Log; import androidx.preference.Preference; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; public class ZenModeRemindersPreferenceController extends AbstractZenModePreferenceController @@ -71,7 +71,7 @@ public class ZenModeRemindersPreferenceController extends AbstractZenModePrefere Log.d(TAG, "onPrefChange allowReminders=" + allowReminders); } mMetricsFeatureProvider.action(mContext, - MetricsProto.MetricsEvent.ACTION_ZEN_ALLOW_REMINDERS, allowReminders); + SettingsEnums.ACTION_ZEN_ALLOW_REMINDERS, allowReminders); mBackend.saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS, allowReminders); return true; diff --git a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java b/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java index db5c6e1b3e8..d658d5fbb37 100644 --- a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.Settings; import android.util.Log; @@ -25,7 +26,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -95,7 +95,7 @@ public class ZenModeRepeatCallersPreferenceController extends AbstractZenModePre Log.d(TAG, "onPrefChange allowRepeatCallers=" + allowRepeatCallers); } mMetricsFeatureProvider.action(mContext, - MetricsProto.MetricsEvent.ACTION_ZEN_ALLOW_REPEAT_CALLS, allowRepeatCallers); + SettingsEnums.ACTION_ZEN_ALLOW_REPEAT_CALLS, allowRepeatCallers); mBackend.saveSoundPolicy(Policy.PRIORITY_CATEGORY_REPEAT_CALLERS, allowRepeatCallers); return true; } diff --git a/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java b/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java index 56ed086b578..90d97f0461a 100644 --- a/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java +++ b/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java @@ -16,11 +16,11 @@ package com.android.settings.notification; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -71,7 +71,7 @@ public class ZenModeRestrictNotificationsSettings extends ZenModeSettingsBase im @Override public int getMetricsCategory() { - return MetricsEvent.SETTINGS_ZEN_NOTIFICATIONS; + return SettingsEnums.SETTINGS_ZEN_NOTIFICATIONS; } /** diff --git a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java index 8aa993f65cf..e879ece78bf 100644 --- a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java +++ b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java @@ -19,6 +19,7 @@ package com.android.settings.notification; import android.app.AutomaticZenRule; import android.app.Dialog; import android.app.TimePickerDialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnDismissListener; @@ -37,7 +38,6 @@ import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settingslib.core.AbstractPreferenceController; @@ -211,7 +211,7 @@ public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase { @Override public int getMetricsCategory() { - return MetricsEvent.NOTIFICATION_ZEN_MODE_SCHEDULE_RULE; + return SettingsEnums.NOTIFICATION_ZEN_MODE_SCHEDULE_RULE; } @Override @@ -302,7 +302,7 @@ public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase { @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_ZEN_TIMEPICKER; + return SettingsEnums.DIALOG_ZEN_TIMEPICKER; } @Override diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index bdf80a6180a..9360a33521d 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -28,8 +28,8 @@ import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_SYSTEM; import android.app.AutomaticZenRule; import android.app.NotificationManager; import android.app.NotificationManager.Policy; +import android.app.settings.SettingsEnums; import android.content.Context; -import android.icu.text.ListFormatter; import android.provider.SearchIndexableResource; import android.provider.Settings; import android.service.notification.ZenModeConfig; @@ -37,7 +37,6 @@ import android.service.notification.ZenModeConfig; import androidx.annotation.VisibleForTesting; import androidx.fragment.app.FragmentManager; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -66,7 +65,7 @@ public class ZenModeSettings extends ZenModeSettingsBase { @Override public int getMetricsCategory() { - return MetricsEvent.NOTIFICATION_ZEN_MODE; + return SettingsEnums.NOTIFICATION_ZEN_MODE; } @Override diff --git a/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java b/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java index 7c2464c1bb3..e7ce1ddddf5 100644 --- a/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import android.app.Dialog; import android.app.NotificationManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.icu.text.ListFormatter; @@ -34,7 +35,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -225,7 +225,7 @@ public class ZenModeSettingsFooterPreferenceController extends AbstractZenModePr .setDestination( ZenModeAutomationSettings.class.getName()) .setSourceMetricsCategory( - MetricsEvent.NOTIFICATION_ZEN_MODE_AUTOMATION) + SettingsEnums.NOTIFICATION_ZEN_MODE_AUTOMATION) .launch(); } }) @@ -270,7 +270,7 @@ public class ZenModeSettingsFooterPreferenceController extends AbstractZenModePr @Override public int getMetricsCategory() { - return MetricsEvent.ZEN_CUSTOM_SETTINGS_DIALOG; + return SettingsEnums.ZEN_CUSTOM_SETTINGS_DIALOG; } private int getAllowRes(boolean allow) { diff --git a/src/com/android/settings/notification/ZenModeSliceBuilder.java b/src/com/android/settings/notification/ZenModeSliceBuilder.java index 5c88fb66bb0..ceb36feba55 100644 --- a/src/com/android/settings/notification/ZenModeSliceBuilder.java +++ b/src/com/android/settings/notification/ZenModeSliceBuilder.java @@ -23,6 +23,7 @@ import static com.android.settings.notification.ZenModePreferenceController.ZEN_ import android.annotation.ColorInt; import android.app.NotificationManager; import android.app.PendingIntent; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -35,7 +36,6 @@ import androidx.slice.builders.ListBuilder; import androidx.slice.builders.ListBuilder.RowBuilder; import androidx.slice.builders.SliceAction; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SubSettings; import com.android.settings.Utils; @@ -114,7 +114,7 @@ public class ZenModeSliceBuilder { final String screenTitle = context.getText(R.string.zen_mode_settings_title).toString(); return SliceBuilderUtils.buildSearchResultPageIntent(context, ZenModeSettings.class.getName(), ZEN_MODE_KEY, screenTitle, - MetricsEvent.NOTIFICATION_ZEN_MODE) + SettingsEnums.NOTIFICATION_ZEN_MODE) .setClassName(context.getPackageName(), SubSettings.class.getName()) .setData(contentUri); } diff --git a/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java b/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java index 5bc58485102..9f30759cc8d 100644 --- a/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java +++ b/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java @@ -16,10 +16,10 @@ package com.android.settings.notification; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -64,7 +64,7 @@ public class ZenModeSoundVibrationSettings extends ZenModeSettingsBase implement @Override public int getMetricsCategory() { - return MetricsEvent.NOTIFICATION_ZEN_MODE_PRIORITY; + return SettingsEnums.NOTIFICATION_ZEN_MODE_PRIORITY; } /** diff --git a/src/com/android/settings/notification/ZenModeSystemPreferenceController.java b/src/com/android/settings/notification/ZenModeSystemPreferenceController.java index 73907b9fffd..c2f40602862 100644 --- a/src/com/android/settings/notification/ZenModeSystemPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeSystemPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.Settings; import android.util.Log; @@ -24,7 +25,6 @@ import android.util.Log; import androidx.preference.Preference; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; public class ZenModeSystemPreferenceController extends @@ -74,7 +74,7 @@ public class ZenModeSystemPreferenceController extends Log.d(TAG, "onPrefChange allowSystem=" + allowSystem); } - mMetricsFeatureProvider.action(mContext, MetricsProto.MetricsEvent.ACTION_ZEN_ALLOW_SYSTEM, + mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ZEN_ALLOW_SYSTEM, allowSystem); mBackend.saveSoundPolicy(Policy.PRIORITY_CATEGORY_SYSTEM, allowSystem); return true; diff --git a/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java index 66b2c7bc1a4..07e3429c213 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java @@ -17,12 +17,12 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; +import android.app.settings.SettingsEnums; import android.content.Context; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; public class ZenModeVisEffectsAllPreferenceController @@ -70,7 +70,7 @@ public class ZenModeVisEffectsAllPreferenceController @Override public void onRadioButtonClick(ZenCustomRadioButtonPreference p) { mMetricsFeatureProvider.action(mContext, - MetricsProto.MetricsEvent.ACTION_ZEN_SOUND_AND_VIS_EFFECTS, true); + SettingsEnums.ACTION_ZEN_SOUND_AND_VIS_EFFECTS, true); mBackend.saveVisualEffectsPolicy(EFFECTS, true); } } diff --git a/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java index 414465f2cee..69486692974 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java @@ -17,12 +17,12 @@ package com.android.settings.notification; import android.app.NotificationManager; +import android.app.settings.SettingsEnums; import android.content.Context; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -81,7 +81,7 @@ public class ZenModeVisEffectsCustomPreferenceController protected void select() { mMetricsFeatureProvider.action(mContext, - MetricsProto.MetricsEvent.ACTION_ZEN_CUSTOM, true); + SettingsEnums.ACTION_ZEN_CUSTOM, true); } private void launchCustomSettings() { @@ -89,7 +89,7 @@ public class ZenModeVisEffectsCustomPreferenceController new SubSettingLauncher(mContext) .setDestination(ZenModeBlockedEffectsSettings.class.getName()) .setTitleRes(R.string.zen_mode_what_to_block_title) - .setSourceMetricsCategory(MetricsProto.MetricsEvent.SETTINGS_ZEN_NOTIFICATIONS) + .setSourceMetricsCategory(SettingsEnums.SETTINGS_ZEN_NOTIFICATIONS) .launch(); } } \ No newline at end of file diff --git a/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java index 17fbdb2c5e2..7f729c7d857 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java @@ -17,12 +17,12 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; +import android.app.settings.SettingsEnums; import android.content.Context; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; public class ZenModeVisEffectsNonePreferenceController @@ -69,7 +69,7 @@ public class ZenModeVisEffectsNonePreferenceController @Override public void onRadioButtonClick(ZenCustomRadioButtonPreference preference) { mMetricsFeatureProvider.action(mContext, - MetricsProto.MetricsEvent.ACTION_ZEN_SOUND_ONLY, true); + SettingsEnums.ACTION_ZEN_SOUND_ONLY, true); mBackend.saveVisualEffectsPolicy(EFFECTS, false); } } diff --git a/src/com/android/settings/notification/ZenOnboardingActivity.java b/src/com/android/settings/notification/ZenOnboardingActivity.java index 9e9041599dd..87411c2b9ab 100644 --- a/src/com/android/settings/notification/ZenOnboardingActivity.java +++ b/src/com/android/settings/notification/ZenOnboardingActivity.java @@ -19,6 +19,7 @@ package com.android.settings.notification; import android.app.Activity; import android.app.NotificationManager; import android.app.NotificationManager.Policy; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; @@ -32,7 +33,6 @@ import android.widget.RadioButton; import androidx.annotation.VisibleForTesting; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; import com.android.settings.overlay.FeatureFactory; @@ -100,7 +100,7 @@ public class ZenOnboardingActivity extends Activity { mKeepCurrentSettingButton.setOnClickListener(currentSettingClickListener); mKeepCurrentSettingButton.setChecked(true); - mMetrics.visible(MetricsEvent.SETTINGS_ZEN_ONBOARDING); + mMetrics.visible(SettingsEnums.SETTINGS_ZEN_ONBOARDING); } @VisibleForTesting @@ -114,7 +114,7 @@ public class ZenOnboardingActivity extends Activity { } public void launchSettings(View button) { - mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_SETTINGS); + mMetrics.action(SettingsEnums.ACTION_ZEN_ONBOARDING_SETTINGS); Intent settings = new Intent(Settings.ACTION_ZEN_MODE_SETTINGS); settings.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); startActivity(settings); @@ -130,9 +130,9 @@ public class ZenOnboardingActivity extends Activity { policy.priorityMessageSenders, NotificationManager.Policy.getAllSuppressedVisualEffects()); mNm.setNotificationPolicy(newPolicy); - mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_OK); + mMetrics.action(SettingsEnums.ACTION_ZEN_ONBOARDING_OK); } else { - mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_KEEP_CURRENT_SETTINGS); + mMetrics.action(SettingsEnums.ACTION_ZEN_ONBOARDING_KEEP_CURRENT_SETTINGS); } Settings.Secure.putInt(getApplicationContext().getContentResolver(), diff --git a/src/com/android/settings/notification/ZenRuleButtonsPreferenceController.java b/src/com/android/settings/notification/ZenRuleButtonsPreferenceController.java index 1d43f6dde3e..a773908607e 100644 --- a/src/com/android/settings/notification/ZenRuleButtonsPreferenceController.java +++ b/src/com/android/settings/notification/ZenRuleButtonsPreferenceController.java @@ -17,11 +17,11 @@ package com.android.settings.notification; import android.app.AutomaticZenRule; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.text.TextUtils; -import android.util.Log; import android.view.View; import androidx.fragment.app.Fragment; @@ -83,7 +83,7 @@ public class ZenRuleButtonsPreferenceController extends AbstractZenModePreferenc return; } mMetricsFeatureProvider.action(mContext, - MetricsProto.MetricsEvent.ACTION_ZEN_MODE_RULE_NAME_CHANGE_OK); + SettingsEnums.ACTION_ZEN_MODE_RULE_NAME_CHANGE_OK); mRule.setName(ruleName); mRule.setModified(true); mBackend.updateZenRule(mId, mRule); @@ -104,7 +104,7 @@ public class ZenRuleButtonsPreferenceController extends AbstractZenModePreferenc Bundle bundle = new Bundle(); bundle.putString(ZenModeAutomationSettings.DELETE, id); mMetricsFeatureProvider.action(mContext, - MetricsProto.MetricsEvent.ACTION_ZEN_DELETE_RULE_OK); + SettingsEnums.ACTION_ZEN_DELETE_RULE_OK); new SubSettingLauncher(mContext) .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) .setDestination(ZenModeAutomationSettings.class.getName()) diff --git a/src/com/android/settings/notification/ZenRuleCallsPreferenceController.java b/src/com/android/settings/notification/ZenRuleCallsPreferenceController.java index b27c5feb0e0..87f2db2e2c2 100644 --- a/src/com/android/settings/notification/ZenRuleCallsPreferenceController.java +++ b/src/com/android/settings/notification/ZenRuleCallsPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.notification; +import android.app.settings.SettingsEnums; import android.content.Context; import android.service.notification.ZenPolicy; import android.text.TextUtils; @@ -49,7 +50,7 @@ public class ZenRuleCallsPreferenceController extends AbstractZenCustomRulePrefe public boolean onPreferenceChange(Preference preference, Object selectedContactsFrom) { int allowCalls = ZenModeBackend.getZenPolicySettingFromPrefKey( selectedContactsFrom.toString()); - mMetricsFeatureProvider.action(mContext, MetricsProto.MetricsEvent.ACTION_ZEN_ALLOW_CALLS, + mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ZEN_ALLOW_CALLS, Pair.create(MetricsProto.MetricsEvent.FIELD_ZEN_TOGGLE_EXCEPTION, allowCalls), Pair.create(MetricsProto.MetricsEvent.FIELD_ZEN_RULE_ID, mId)); mRule.setZenPolicy(new ZenPolicy.Builder(mRule.getZenPolicy()) diff --git a/src/com/android/settings/notification/ZenRuleCustomPolicyPreferenceController.java b/src/com/android/settings/notification/ZenRuleCustomPolicyPreferenceController.java index 39de0eb65ee..e41d55f8417 100644 --- a/src/com/android/settings/notification/ZenRuleCustomPolicyPreferenceController.java +++ b/src/com/android/settings/notification/ZenRuleCustomPolicyPreferenceController.java @@ -16,14 +16,13 @@ package com.android.settings.notification; +import android.app.settings.SettingsEnums; import android.content.Context; import android.service.notification.ZenPolicy; -import android.util.Log; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.SubSettingLauncher; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -75,7 +74,7 @@ public class ZenRuleCustomPolicyPreferenceController extends new SubSettingLauncher(mContext) .setDestination(ZenCustomRuleConfigSettings.class.getName()) .setArguments(createBundle()) - .setSourceMetricsCategory(MetricsProto.MetricsEvent.ZEN_CUSTOM_RULE_SOUND_SETTINGS) + .setSourceMetricsCategory(SettingsEnums.ZEN_CUSTOM_RULE_SOUND_SETTINGS) .launch(); } } \ No newline at end of file diff --git a/src/com/android/settings/notification/ZenRuleCustomSwitchPreferenceController.java b/src/com/android/settings/notification/ZenRuleCustomSwitchPreferenceController.java index 804469e37d9..69aa81e5a67 100644 --- a/src/com/android/settings/notification/ZenRuleCustomSwitchPreferenceController.java +++ b/src/com/android/settings/notification/ZenRuleCustomSwitchPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.notification; +import android.app.settings.SettingsEnums; import android.content.Context; import android.service.notification.ZenPolicy; import android.util.Log; diff --git a/src/com/android/settings/notification/ZenRuleDefaultPolicyPreferenceController.java b/src/com/android/settings/notification/ZenRuleDefaultPolicyPreferenceController.java index 857d8534c23..da40e6c2b43 100644 --- a/src/com/android/settings/notification/ZenRuleDefaultPolicyPreferenceController.java +++ b/src/com/android/settings/notification/ZenRuleDefaultPolicyPreferenceController.java @@ -16,13 +16,14 @@ package com.android.settings.notification; +import android.app.settings.SettingsEnums; import android.content.Context; import android.util.Pair; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -53,8 +54,8 @@ public class ZenRuleDefaultPolicyPreferenceController extends if (mId == null || mRule == null) { return; } - mMetricsFeatureProvider.action(mContext, MetricsEvent.ZEN_CUSTOM_RULE_DEFAULT_SETTINGS, - Pair.create(MetricsEvent.FIELD_ZEN_RULE_ID, mId)); + mMetricsFeatureProvider.action(mContext, SettingsEnums.ZEN_CUSTOM_RULE_DEFAULT_SETTINGS, + Pair.create(MetricsProto.MetricsEvent.FIELD_ZEN_RULE_ID, mId)); mPreference.setChecked(mRule.getZenPolicy() == null); } } \ No newline at end of file diff --git a/src/com/android/settings/notification/ZenRuleMessagesPreferenceController.java b/src/com/android/settings/notification/ZenRuleMessagesPreferenceController.java index 010e152344f..59ad3a89eba 100644 --- a/src/com/android/settings/notification/ZenRuleMessagesPreferenceController.java +++ b/src/com/android/settings/notification/ZenRuleMessagesPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.notification; +import android.app.settings.SettingsEnums; import android.content.Context; import android.service.notification.ZenPolicy; import android.text.TextUtils; @@ -50,7 +51,7 @@ public class ZenRuleMessagesPreferenceController extends AbstractZenCustomRulePr int allowMessages = ZenModeBackend.getZenPolicySettingFromPrefKey( selectedContactsFrom.toString()); mMetricsFeatureProvider.action(mContext, - MetricsProto.MetricsEvent.ACTION_ZEN_ALLOW_MESSAGES, + SettingsEnums.ACTION_ZEN_ALLOW_MESSAGES, Pair.create(MetricsProto.MetricsEvent.FIELD_ZEN_TOGGLE_EXCEPTION, allowMessages), Pair.create(MetricsProto.MetricsEvent.FIELD_ZEN_RULE_ID, mId)); mRule.setZenPolicy(new ZenPolicy.Builder(mRule.getZenPolicy()) diff --git a/src/com/android/settings/notification/ZenRuleNameDialog.java b/src/com/android/settings/notification/ZenRuleNameDialog.java index 9ae32ff1e28..edb303535f4 100644 --- a/src/com/android/settings/notification/ZenRuleNameDialog.java +++ b/src/com/android/settings/notification/ZenRuleNameDialog.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.net.Uri; @@ -30,7 +31,6 @@ import android.widget.EditText; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -42,7 +42,7 @@ public class ZenRuleNameDialog extends InstrumentedDialogFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.NOTIFICATION_ZEN_MODE_RULE_NAME_DIALOG; + return SettingsEnums.NOTIFICATION_ZEN_MODE_RULE_NAME_DIALOG; } /** diff --git a/src/com/android/settings/notification/ZenRulePreference.java b/src/com/android/settings/notification/ZenRulePreference.java index 91f68e824a7..613eb1d0b53 100644 --- a/src/com/android/settings/notification/ZenRulePreference.java +++ b/src/com/android/settings/notification/ZenRulePreference.java @@ -20,10 +20,8 @@ import android.app.AutomaticZenRule; import android.content.ComponentName; import android.content.Context; import android.content.Intent; -import android.content.pm.ApplicationInfo; import android.content.pm.ComponentInfo; import android.content.pm.PackageManager; -import android.content.pm.ServiceInfo; import android.service.notification.ZenModeConfig; import android.view.View; import android.widget.CheckBox; @@ -32,7 +30,6 @@ import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.utils.ManagedServiceSettings; import com.android.settings.utils.ZenServiceListing; @@ -40,7 +37,6 @@ import com.android.settingslib.TwoTargetPreference; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import java.util.Map; -import java.util.Objects; public class ZenRulePreference extends TwoTargetPreference { private static final ManagedServiceSettings.Config CONFIG = diff --git a/src/com/android/settings/notification/ZenRuleRepeatCallersPreferenceController.java b/src/com/android/settings/notification/ZenRuleRepeatCallersPreferenceController.java index 1161bec195f..7f3b0638de0 100644 --- a/src/com/android/settings/notification/ZenRuleRepeatCallersPreferenceController.java +++ b/src/com/android/settings/notification/ZenRuleRepeatCallersPreferenceController.java @@ -15,6 +15,7 @@ */ package com.android.settings.notification; +import android.app.settings.SettingsEnums; import android.content.Context; import android.service.notification.ZenPolicy; import android.util.Log; @@ -24,7 +25,7 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; public class ZenRuleRepeatCallersPreferenceController extends @@ -73,9 +74,9 @@ public class ZenRuleRepeatCallersPreferenceController extends Log.d(TAG, KEY + " onPrefChange mRule=" + mRule + " mCategory=" + ZenPolicy.PRIORITY_CATEGORY_REPEAT_CALLERS + " allow=" + allow); } - mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_REPEAT_CALLS, - Pair.create(MetricsEvent.FIELD_ZEN_TOGGLE_EXCEPTION, allow ? 1 : 0), - Pair.create(MetricsEvent.FIELD_ZEN_RULE_ID, mId)); + mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ZEN_ALLOW_REPEAT_CALLS, + Pair.create(MetricsProto.MetricsEvent.FIELD_ZEN_TOGGLE_EXCEPTION, allow ? 1 : 0), + Pair.create(MetricsProto.MetricsEvent.FIELD_ZEN_RULE_ID, mId)); mRule.setZenPolicy(new ZenPolicy.Builder(mRule.getZenPolicy()) .allowRepeatCallers(allow) .build()); diff --git a/src/com/android/settings/notification/ZenRuleSelectionDialog.java b/src/com/android/settings/notification/ZenRuleSelectionDialog.java index 7f0b4c2dff6..5b4b35ba743 100644 --- a/src/com/android/settings/notification/ZenRuleSelectionDialog.java +++ b/src/com/android/settings/notification/ZenRuleSelectionDialog.java @@ -16,16 +16,14 @@ package com.android.settings.notification; -import static com.android.internal.logging.nano.MetricsProto.MetricsEvent; - import android.app.Dialog; import android.app.NotificationManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.content.pm.ApplicationInfo; import android.content.pm.ComponentInfo; import android.content.pm.PackageManager; -import android.content.pm.ServiceInfo; import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.os.Bundle; @@ -37,6 +35,9 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; + import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.utils.ZenServiceListing; @@ -47,9 +48,6 @@ import java.util.Comparator; import java.util.Set; import java.util.TreeSet; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; - public class ZenRuleSelectionDialog extends InstrumentedDialogFragment { private static final String TAG = "ZenRuleSelectionDialog"; private static final boolean DEBUG = ZenModeSettings.DEBUG; @@ -72,7 +70,7 @@ public class ZenRuleSelectionDialog extends InstrumentedDialogFragment { @Override public int getMetricsCategory() { - return MetricsEvent.NOTIFICATION_ZEN_MODE_RULE_SELECTION_DIALOG; + return SettingsEnums.NOTIFICATION_ZEN_MODE_RULE_SELECTION_DIALOG; } public static void show(Context context, Fragment parent, PositiveClickListener diff --git a/src/com/android/settings/notification/ZenRuleVisEffectPreferenceController.java b/src/com/android/settings/notification/ZenRuleVisEffectPreferenceController.java index 94b82347984..f5791510b65 100644 --- a/src/com/android/settings/notification/ZenRuleVisEffectPreferenceController.java +++ b/src/com/android/settings/notification/ZenRuleVisEffectPreferenceController.java @@ -16,9 +16,9 @@ package com.android.settings.notification; +import android.app.settings.SettingsEnums; import android.content.Context; import android.service.notification.ZenPolicy; -import android.util.Log; import android.util.Pair; import androidx.annotation.VisibleForTesting; diff --git a/src/com/android/settings/notification/ZenRuleVisEffectsAllPreferenceController.java b/src/com/android/settings/notification/ZenRuleVisEffectsAllPreferenceController.java index 9ddd624e421..1c6874e6c92 100644 --- a/src/com/android/settings/notification/ZenRuleVisEffectsAllPreferenceController.java +++ b/src/com/android/settings/notification/ZenRuleVisEffectsAllPreferenceController.java @@ -16,15 +16,15 @@ package com.android.settings.notification; +import android.app.settings.SettingsEnums; import android.content.Context; import android.service.notification.ZenPolicy; -import android.util.Log; import android.util.Pair; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -44,8 +44,8 @@ public class ZenRuleVisEffectsAllPreferenceController extends mPreference = (ZenCustomRadioButtonPreference) screen.findPreference(getPreferenceKey()); mPreference.setOnRadioButtonClickListener(p -> { - mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_ZEN_SOUND_ONLY, - Pair.create(MetricsEvent.FIELD_ZEN_RULE_ID, mId)); + mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ZEN_SOUND_ONLY, + Pair.create(MetricsProto.MetricsEvent.FIELD_ZEN_RULE_ID, mId)); mRule.setZenPolicy(new ZenPolicy.Builder(mRule.getZenPolicy()) .showAllVisualEffects() .build()); diff --git a/src/com/android/settings/notification/ZenRuleVisEffectsCustomPreferenceController.java b/src/com/android/settings/notification/ZenRuleVisEffectsCustomPreferenceController.java index 64dd71c004f..3cdd86a15a9 100644 --- a/src/com/android/settings/notification/ZenRuleVisEffectsCustomPreferenceController.java +++ b/src/com/android/settings/notification/ZenRuleVisEffectsCustomPreferenceController.java @@ -16,13 +16,14 @@ package com.android.settings.notification; +import android.app.settings.SettingsEnums; import android.content.Context; import android.util.Pair; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.SubSettingLauncher; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -64,12 +65,12 @@ public class ZenRuleVisEffectsCustomPreferenceController extends } private void launchCustomSettings() { - mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_ZEN_SHOW_CUSTOM, - Pair.create(MetricsEvent.FIELD_ZEN_RULE_ID, mId)); + mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ZEN_SHOW_CUSTOM, + Pair.create(MetricsProto.MetricsEvent.FIELD_ZEN_RULE_ID, mId)); new SubSettingLauncher(mContext) .setDestination(ZenCustomRuleBlockedEffectsSettings.class.getName()) .setArguments(createBundle()) - .setSourceMetricsCategory(MetricsEvent.ZEN_CUSTOM_RULE_VIS_EFFECTS) + .setSourceMetricsCategory(SettingsEnums.ZEN_CUSTOM_RULE_VIS_EFFECTS) .launch(); } } \ No newline at end of file diff --git a/src/com/android/settings/notification/ZenRuleVisEffectsNonePreferenceController.java b/src/com/android/settings/notification/ZenRuleVisEffectsNonePreferenceController.java index 4f98924c5f8..875fb43e0bd 100644 --- a/src/com/android/settings/notification/ZenRuleVisEffectsNonePreferenceController.java +++ b/src/com/android/settings/notification/ZenRuleVisEffectsNonePreferenceController.java @@ -16,15 +16,15 @@ package com.android.settings.notification; +import android.app.settings.SettingsEnums; import android.content.Context; import android.service.notification.ZenPolicy; -import android.util.Log; import android.util.Pair; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -41,11 +41,11 @@ public class ZenRuleVisEffectsNonePreferenceController extends @Override public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); - mPreference = (ZenCustomRadioButtonPreference) screen.findPreference(getPreferenceKey()); + mPreference = screen.findPreference(getPreferenceKey()); mPreference.setOnRadioButtonClickListener(p -> { - mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_ZEN_SOUND_AND_VIS_EFFECTS, - Pair.create(MetricsEvent.FIELD_ZEN_RULE_ID, mId)); + mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ZEN_SOUND_AND_VIS_EFFECTS, + Pair.create(MetricsProto.MetricsEvent.FIELD_ZEN_RULE_ID, mId)); mRule.setZenPolicy(new ZenPolicy.Builder(mRule.getZenPolicy()) .hideAllVisualEffects() .build()); diff --git a/src/com/android/settings/panel/PanelFragment.java b/src/com/android/settings/panel/PanelFragment.java index 7655be8f006..3d302fc011b 100644 --- a/src/com/android/settings/panel/PanelFragment.java +++ b/src/com/android/settings/panel/PanelFragment.java @@ -22,21 +22,18 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; - import android.widget.Button; import android.widget.TextView; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.android.internal.annotations.VisibleForTesting; -import com.android.settings.R; - import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import com.android.internal.annotations.VisibleForTesting; +import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; public class PanelFragment extends Fragment { diff --git a/src/com/android/settings/panel/SettingsPanelActivity.java b/src/com/android/settings/panel/SettingsPanelActivity.java index ffe94f88acb..02e14e80aaa 100644 --- a/src/com/android/settings/panel/SettingsPanelActivity.java +++ b/src/com/android/settings/panel/SettingsPanelActivity.java @@ -18,7 +18,6 @@ package com.android.settings.panel; import android.content.Intent; import android.os.Bundle; - import android.util.Log; import android.view.Gravity; import android.view.Window; diff --git a/src/com/android/settings/panel/VolumePanel.java b/src/com/android/settings/panel/VolumePanel.java index c0118d75290..352fed558d7 100644 --- a/src/com/android/settings/panel/VolumePanel.java +++ b/src/com/android/settings/panel/VolumePanel.java @@ -27,6 +27,7 @@ import android.net.Uri; import android.provider.Settings; import com.android.settings.R; + import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/password/BiometricFragment.java b/src/com/android/settings/password/BiometricFragment.java index 3a12bacfd8a..13ec5431d68 100644 --- a/src/com/android/settings/password/BiometricFragment.java +++ b/src/com/android/settings/password/BiometricFragment.java @@ -27,13 +27,11 @@ import android.os.CancellationSignal; import android.os.Handler; import android.os.Looper; -import com.android.settings.core.InstrumentedFragment; - -import androidx.annotation.NonNull; -import androidx.fragment.app.Fragment; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.android.settings.core.InstrumentedFragment; + import java.util.concurrent.Executor; /** diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java index cbb35935871..ca963448bd5 100644 --- a/src/com/android/settings/password/ChooseLockGeneric.java +++ b/src/com/android/settings/password/ChooseLockGeneric.java @@ -25,6 +25,7 @@ import android.accessibilityservice.AccessibilityServiceInfo; import android.app.Activity; import android.app.Dialog; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.pm.UserInfo; @@ -51,7 +52,6 @@ import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.EncryptionInterstitial; import com.android.settings.EventLogTags; @@ -157,7 +157,7 @@ public class ChooseLockGeneric extends SettingsActivity { @Override public int getMetricsCategory() { - return MetricsEvent.CHOOSE_LOCK_GENERIC; + return SettingsEnums.CHOOSE_LOCK_GENERIC; } @Override @@ -1022,7 +1022,7 @@ public class ChooseLockGeneric extends SettingsActivity { @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_FRP; + return SettingsEnums.DIALOG_FRP; } } } diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java index 35bc45e84d7..6ff93f33fac 100644 --- a/src/com/android/settings/password/ChooseLockPassword.java +++ b/src/com/android/settings/password/ChooseLockPassword.java @@ -25,6 +25,7 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COM import android.app.Activity; import android.app.admin.DevicePolicyManager; import android.app.admin.PasswordMetrics; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.res.Resources.Theme; @@ -56,7 +57,6 @@ import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils.RequestThrottledException; import com.android.internal.widget.TextViewInputDisabler; @@ -526,7 +526,7 @@ public class ChooseLockPassword extends SettingsActivity { @Override public int getMetricsCategory() { - return MetricsEvent.CHOOSE_LOCK_PASSWORD; + return SettingsEnums.CHOOSE_LOCK_PASSWORD; } @Override diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java index 2738a26e03a..55ca4baeff4 100644 --- a/src/com/android/settings/password/ChooseLockPattern.java +++ b/src/com/android/settings/password/ChooseLockPattern.java @@ -17,6 +17,7 @@ package com.android.settings.password; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.res.ColorStateList; @@ -34,7 +35,6 @@ import android.widget.TextView; import androidx.fragment.app.Fragment; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient; import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils.RequestThrottledException; @@ -303,7 +303,7 @@ public class ChooseLockPattern extends SettingsActivity { @Override public int getMetricsCategory() { - return MetricsEvent.CHOOSE_LOCK_PATTERN; + return SettingsEnums.CHOOSE_LOCK_PATTERN; } diff --git a/src/com/android/settings/password/ChooseLockSettingsHelper.java b/src/com/android/settings/password/ChooseLockSettingsHelper.java index 1c9191a3f73..8d0fa602d66 100644 --- a/src/com/android/settings/password/ChooseLockSettingsHelper.java +++ b/src/com/android/settings/password/ChooseLockSettingsHelper.java @@ -29,7 +29,6 @@ import androidx.annotation.VisibleForTesting; import androidx.fragment.app.Fragment; import com.android.internal.widget.LockPatternUtils; -import com.android.settings.SettingsActivity; import com.android.settings.Utils; import com.google.android.setupcompat.util.WizardManagerHelper; diff --git a/src/com/android/settings/password/ChooseLockTypeDialogFragment.java b/src/com/android/settings/password/ChooseLockTypeDialogFragment.java index 191f82795a6..8793471e206 100644 --- a/src/com/android/settings/password/ChooseLockTypeDialogFragment.java +++ b/src/com/android/settings/password/ChooseLockTypeDialogFragment.java @@ -19,6 +19,7 @@ package com.android.settings.password; import android.app.Activity; import android.app.Dialog; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; @@ -34,7 +35,6 @@ import android.widget.TextView; import androidx.appcompat.app.AlertDialog.Builder; import androidx.fragment.app.Fragment; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -139,7 +139,7 @@ public class ChooseLockTypeDialogFragment extends InstrumentedDialogFragment @Override public int getMetricsCategory() { - return MetricsEvent.SETTINGS_CHOOSE_LOCK_DIALOG; + return SettingsEnums.SETTINGS_CHOOSE_LOCK_DIALOG; } private static class ScreenLockAdapter extends ArrayAdapter { diff --git a/src/com/android/settings/password/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java index b5bca159fb4..7344077d742 100644 --- a/src/com/android/settings/password/ConfirmLockPassword.java +++ b/src/com/android/settings/password/ConfirmLockPassword.java @@ -17,6 +17,7 @@ package com.android.settings.password; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.graphics.Typeface; @@ -41,7 +42,6 @@ import android.widget.TextView.OnEditorActionListener; import androidx.fragment.app.Fragment; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternChecker; import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.TextViewInputDisabler; @@ -274,7 +274,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { @Override public int getMetricsCategory() { - return MetricsEvent.CONFIRM_LOCK_PASSWORD; + return SettingsEnums.CONFIRM_LOCK_PASSWORD; } @Override diff --git a/src/com/android/settings/password/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java index 83141ea3d68..5645193c01a 100644 --- a/src/com/android/settings/password/ConfirmLockPattern.java +++ b/src/com/android/settings/password/ConfirmLockPattern.java @@ -17,6 +17,7 @@ package com.android.settings.password; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.Intent; import android.os.AsyncTask; import android.os.Bundle; @@ -31,7 +32,6 @@ import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; import android.widget.TextView; -import com.android.internal.logging.nano.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 public int getMetricsCategory() { - return MetricsEvent.CONFIRM_LOCK_PATTERN; + return SettingsEnums.CONFIRM_LOCK_PATTERN; } @Override diff --git a/src/com/android/settings/password/SetupSkipDialog.java b/src/com/android/settings/password/SetupSkipDialog.java index ad28ddbe8f4..dc1894ede6e 100644 --- a/src/com/android/settings/password/SetupSkipDialog.java +++ b/src/com/android/settings/password/SetupSkipDialog.java @@ -18,6 +18,7 @@ package com.android.settings.password; import android.app.Activity; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.os.Bundle; @@ -25,7 +26,6 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentManager; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -48,7 +48,7 @@ public class SetupSkipDialog extends InstrumentedDialogFragment @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_FINGERPRINT_SKIP_SETUP; + return SettingsEnums.DIALOG_FINGERPRINT_SKIP_SETUP; } @Override diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java index 1d6ff5a1451..eeb8ed45f30 100644 --- a/src/com/android/settings/print/PrintJobSettingsFragment.java +++ b/src/com/android/settings/print/PrintJobSettingsFragment.java @@ -16,6 +16,7 @@ package com.android.settings.print; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.print.PrintJob; @@ -24,7 +25,6 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; @@ -56,7 +56,7 @@ public class PrintJobSettingsFragment extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.PRINT_JOB_SETTINGS; + return SettingsEnums.PRINT_JOB_SETTINGS; } @Override diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java index 58e4ada72c7..d12006250cb 100644 --- a/src/com/android/settings/print/PrintServiceSettingsFragment.java +++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java @@ -17,6 +17,7 @@ package com.android.settings.print; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -55,7 +56,6 @@ import androidx.loader.content.Loader; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; @@ -117,7 +117,7 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.PRINT_SERVICE_SETTINGS; + return SettingsEnums.PRINT_SERVICE_SETTINGS; } @Override diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java index 63ffe87f15a..955d4f7f378 100644 --- a/src/com/android/settings/print/PrintSettingsFragment.java +++ b/src/com/android/settings/print/PrintSettingsFragment.java @@ -18,6 +18,7 @@ package com.android.settings.print; import static com.android.settings.print.PrintSettingPreferenceController.shouldShowToUser; +import android.app.settings.SettingsEnums; import android.content.ActivityNotFoundException; import android.content.ComponentName; import android.content.Context; @@ -51,7 +52,6 @@ import androidx.loader.content.Loader; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -96,7 +96,7 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.PRINT_SETTINGS; + return SettingsEnums.PRINT_SETTINGS; } @Override diff --git a/src/com/android/settings/privacy/PrivacyDashboardFragment.java b/src/com/android/settings/privacy/PrivacyDashboardFragment.java index 91e85b3a3e6..8f1d4c74ecc 100644 --- a/src/com/android/settings/privacy/PrivacyDashboardFragment.java +++ b/src/com/android/settings/privacy/PrivacyDashboardFragment.java @@ -16,10 +16,10 @@ package com.android.settings.privacy; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.notification.LockScreenNotificationPreferenceController; @@ -42,7 +42,7 @@ public class PrivacyDashboardFragment extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.TOP_LEVEL_PRIVACY; + return SettingsEnums.TOP_LEVEL_PRIVACY; } @Override diff --git a/src/com/android/settings/search/BaseSearchIndexProvider.java b/src/com/android/settings/search/BaseSearchIndexProvider.java index efbefde5b48..80775bf82e4 100644 --- a/src/com/android/settings/search/BaseSearchIndexProvider.java +++ b/src/com/android/settings/search/BaseSearchIndexProvider.java @@ -18,8 +18,7 @@ package com.android.settings.search; import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEY; import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_SEARCHABLE; -import static com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag - .FLAG_INCLUDE_PREF_SCREEN; +import static com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag.FLAG_INCLUDE_PREF_SCREEN; import static com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag.FLAG_NEED_KEY; import static com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag.FLAG_NEED_SEARCHABLE; diff --git a/src/com/android/settings/search/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java index 34f8629c6e0..b98936e796c 100644 --- a/src/com/android/settings/search/SearchFeatureProvider.java +++ b/src/com/android/settings/search/SearchFeatureProvider.java @@ -20,6 +20,7 @@ import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO; import android.annotation.NonNull; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -29,7 +30,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Toolbar; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.overlay.FeatureFactory; @@ -99,7 +99,7 @@ public interface SearchFeatureProvider { FeatureFactory.getFactory(context).getSlicesFeatureProvider() .indexSliceDataAsync(activity.getApplicationContext()); FeatureFactory.getFactory(context).getMetricsFeatureProvider() - .action(context, MetricsProto.MetricsEvent.ACTION_SEARCH_RESULTS); + .action(context, SettingsEnums.ACTION_SEARCH_RESULTS); activity.startActivityForResult(intent, REQUEST_CODE); }); } diff --git a/src/com/android/settings/search/actionbar/SearchMenuController.java b/src/com/android/settings/search/actionbar/SearchMenuController.java index 643f0c3493a..2f1c27084f8 100644 --- a/src/com/android/settings/search/actionbar/SearchMenuController.java +++ b/src/com/android/settings/search/actionbar/SearchMenuController.java @@ -17,6 +17,7 @@ package com.android.settings.search.actionbar; import android.annotation.NonNull; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -27,7 +28,6 @@ import android.view.MenuItem; import androidx.fragment.app.Fragment; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.overlay.FeatureFactory; @@ -88,7 +88,7 @@ public class SearchMenuController implements LifecycleObserver, OnCreateOptionsM } FeatureFactory.getFactory(context).getMetricsFeatureProvider() - .action(context, MetricsProto.MetricsEvent.ACTION_SEARCH_RESULTS); + .action(context, SettingsEnums.ACTION_SEARCH_RESULTS); mHost.startActivityForResult(intent, 0 /* requestCode */); return true; }); diff --git a/src/com/android/settings/security/ConfigureKeyGuardDialog.java b/src/com/android/settings/security/ConfigureKeyGuardDialog.java index 01c0e9ec79a..fff106c2791 100644 --- a/src/com/android/settings/security/ConfigureKeyGuardDialog.java +++ b/src/com/android/settings/security/ConfigureKeyGuardDialog.java @@ -19,6 +19,7 @@ package com.android.settings.security; import android.app.Activity; import android.app.Dialog; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; @@ -26,7 +27,6 @@ import android.os.Bundle; import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.CredentialStorage; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -44,7 +44,7 @@ public class ConfigureKeyGuardDialog extends InstrumentedDialogFragment @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.CONFIGURE_KEYGUARD_DIALOG; + return SettingsEnums.CONFIGURE_KEYGUARD_DIALOG; } @Override diff --git a/src/com/android/settings/security/CryptKeeperSettings.java b/src/com/android/settings/security/CryptKeeperSettings.java index a0e5a8e66da..c80ad115ff5 100644 --- a/src/com/android/settings/security/CryptKeeperSettings.java +++ b/src/com/android/settings/security/CryptKeeperSettings.java @@ -18,6 +18,7 @@ package com.android.settings.security; import android.app.Activity; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -36,7 +37,6 @@ import android.widget.Button; import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.CryptKeeperConfirm; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -123,7 +123,7 @@ public class CryptKeeperSettings extends InstrumentedPreferenceFragment { @Override public int getMetricsCategory() { - return MetricsEvent.CRYPT_KEEPER; + return SettingsEnums.CRYPT_KEEPER; } @Override diff --git a/src/com/android/settings/security/EncryptionAndCredential.java b/src/com/android/settings/security/EncryptionAndCredential.java index 7f50c5dff29..a6d2a0ab838 100644 --- a/src/com/android/settings/security/EncryptionAndCredential.java +++ b/src/com/android/settings/security/EncryptionAndCredential.java @@ -16,14 +16,13 @@ package com.android.settings.security; -import static com.android.settings.security.EncryptionStatusPreferenceController - .PREF_KEY_ENCRYPTION_DETAIL_PAGE; +import static com.android.settings.security.EncryptionStatusPreferenceController.PREF_KEY_ENCRYPTION_DETAIL_PAGE; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.UserManager; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -46,7 +45,7 @@ public class EncryptionAndCredential extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.ENCRYPTION_AND_CREDENTIAL; + return SettingsEnums.ENCRYPTION_AND_CREDENTIAL; } @Override diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java index 62c8d6b52a9..1935f05ef81 100644 --- a/src/com/android/settings/security/LockscreenDashboardFragment.java +++ b/src/com/android/settings/security/LockscreenDashboardFragment.java @@ -16,20 +16,19 @@ package com.android.settings.security; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; import androidx.annotation.VisibleForTesting; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController; import com.android.settings.display.AmbientDisplayNotificationsPreferenceController; import com.android.settings.gestures.DoubleTapScreenPreferenceController; import com.android.settings.gestures.PickupGesturePreferenceController; -import com.android.settings.gestures.WakeScreenGesturePreferenceController; import com.android.settings.notification.LockScreenNotificationPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.security.screenlock.LockScreenPreferenceController; @@ -70,7 +69,7 @@ public class LockscreenDashboardFragment extends DashboardFragment @Override public int getMetricsCategory() { - return MetricsEvent.SETTINGS_LOCK_SCREEN_PREFERENCES; + return SettingsEnums.SETTINGS_LOCK_SCREEN_PREFERENCES; } @Override diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java index 092ec91ccb8..22223fdce5a 100644 --- a/src/com/android/settings/security/ScreenPinningSettings.java +++ b/src/com/android/settings/security/ScreenPinningSettings.java @@ -16,6 +16,7 @@ package com.android.settings.security; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -32,7 +33,6 @@ import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -61,7 +61,7 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.SCREEN_PINNING; + return SettingsEnums.SCREEN_PINNING; } @Override diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java index aa347c8ab6b..660eab5dbf0 100644 --- a/src/com/android/settings/security/SecuritySettings.java +++ b/src/com/android/settings/security/SecuritySettings.java @@ -15,14 +15,13 @@ */ package com.android.settings.security; -import static com.android.settings.security.EncryptionStatusPreferenceController - .PREF_KEY_ENCRYPTION_SECURITY_PAGE; +import static com.android.settings.security.EncryptionStatusPreferenceController.PREF_KEY_ENCRYPTION_SECURITY_PAGE; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.biometrics.face.FaceStatusPreferenceController; import com.android.settings.biometrics.fingerprint.FingerprintProfileStatusPreferenceController; @@ -54,7 +53,7 @@ public class SecuritySettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SECURITY; + return SettingsEnums.SECURITY; } @Override diff --git a/src/com/android/settings/security/UnificationConfirmationDialog.java b/src/com/android/settings/security/UnificationConfirmationDialog.java index ba4065fcd70..d8638bc5df1 100644 --- a/src/com/android/settings/security/UnificationConfirmationDialog.java +++ b/src/com/android/settings/security/UnificationConfirmationDialog.java @@ -17,13 +17,13 @@ package com.android.settings.security; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.os.Bundle; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentManager; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -74,6 +74,6 @@ public class UnificationConfirmationDialog extends InstrumentedDialogFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_UNIFICATION_CONFIRMATION; + return SettingsEnums.DIALOG_UNIFICATION_CONFIRMATION; } } diff --git a/src/com/android/settings/security/screenlock/ScreenLockSettings.java b/src/com/android/settings/security/screenlock/ScreenLockSettings.java index 90b5e3f3833..3fa9dd86c15 100644 --- a/src/com/android/settings/security/screenlock/ScreenLockSettings.java +++ b/src/com/android/settings/security/screenlock/ScreenLockSettings.java @@ -16,13 +16,13 @@ package com.android.settings.security.screenlock; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.UserHandle; import android.provider.SearchIndexableResource; import androidx.fragment.app.Fragment; -import com.android.internal.logging.nano.MetricsProto; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; @@ -47,7 +47,7 @@ public class ScreenLockSettings extends DashboardFragment @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SCREEN_LOCK_SETTINGS; + return SettingsEnums.SCREEN_LOCK_SETTINGS; } @Override diff --git a/src/com/android/settings/security/trustagent/TrustAgentSettings.java b/src/com/android/settings/security/trustagent/TrustAgentSettings.java index 11d23418731..36a3867e42a 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentSettings.java +++ b/src/com/android/settings/security/trustagent/TrustAgentSettings.java @@ -16,10 +16,10 @@ package com.android.settings.security.trustagent; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -35,7 +35,7 @@ public class TrustAgentSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.TRUST_AGENT; + return SettingsEnums.TRUST_AGENT; } @Override diff --git a/src/com/android/settings/security/trustagent/TrustAgentsExtendUnlockPreferenceController.java b/src/com/android/settings/security/trustagent/TrustAgentsExtendUnlockPreferenceController.java index bfbebaff865..036e07f6dc2 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentsExtendUnlockPreferenceController.java +++ b/src/com/android/settings/security/trustagent/TrustAgentsExtendUnlockPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.security.trustagent; import android.content.Context; -import android.os.UserHandle; import android.provider.Settings; import com.android.settings.core.TogglePreferenceController; diff --git a/src/com/android/settings/security/trustagent/TrustLostLocksScreenPreferenceController.java b/src/com/android/settings/security/trustagent/TrustLostLocksScreenPreferenceController.java index b5e0dd76ae2..e0c516891e3 100644 --- a/src/com/android/settings/security/trustagent/TrustLostLocksScreenPreferenceController.java +++ b/src/com/android/settings/security/trustagent/TrustLostLocksScreenPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.security.trustagent; import android.content.Context; -import android.os.UserHandle; import android.provider.Settings; import com.android.settings.core.TogglePreferenceController; diff --git a/src/com/android/settings/shortcut/CreateShortcut.java b/src/com/android/settings/shortcut/CreateShortcut.java index b5b6438ed56..392685f58ce 100644 --- a/src/com/android/settings/shortcut/CreateShortcut.java +++ b/src/com/android/settings/shortcut/CreateShortcut.java @@ -16,13 +16,12 @@ package com.android.settings.shortcut; -import static com.android.settings.search.actionbar.SearchMenuController - .NEED_SEARCH_ICON_IN_ACTION_BAR; +import static com.android.settings.search.actionbar.SearchMenuController.NEED_SEARCH_ICON_IN_ACTION_BAR; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; @@ -62,7 +61,7 @@ public class CreateShortcut extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_CREATE_SHORTCUT; + return SettingsEnums.SETTINGS_CREATE_SHORTCUT; } @Override diff --git a/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java b/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java index 3576034b710..9b9de5f0315 100644 --- a/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java +++ b/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.shortcut; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; @@ -42,7 +43,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Settings.TetherSettingsActivity; import com.android.settings.core.BasePreferenceController; @@ -213,7 +213,7 @@ public class CreateShortcutPreferenceController extends BasePreferenceController return; } mMetricsFeatureProvider.action( - mContext, MetricsProto.MetricsEvent.ACTION_SETTINGS_CREATE_SHORTCUT, + mContext, SettingsEnums.ACTION_SETTINGS_CREATE_SHORTCUT, info.activityInfo.name); } diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index 24e1874b6bf..b646b3b750b 100644 --- a/src/com/android/settings/sim/SimSettings.java +++ b/src/com/android/settings/sim/SimSettings.java @@ -16,6 +16,7 @@ package com.android.settings.sim; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.res.Resources; @@ -36,7 +37,6 @@ import android.util.Log; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.TelephonyProperties; import com.android.settings.R; import com.android.settings.RestrictedSettingsFragment; @@ -84,7 +84,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable @Override public int getMetricsCategory() { - return MetricsEvent.SIM; + return SettingsEnums.SIM; } @Override diff --git a/src/com/android/settings/slices/SliceBroadcastReceiver.java b/src/com/android/settings/slices/SliceBroadcastReceiver.java index 28b2f818541..061cf1893f7 100644 --- a/src/com/android/settings/slices/SliceBroadcastReceiver.java +++ b/src/com/android/settings/slices/SliceBroadcastReceiver.java @@ -40,7 +40,6 @@ import android.provider.SettingsSlicesContract; import android.text.TextUtils; import android.util.Log; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.bluetooth.BluetoothSliceBuilder; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.SliderPreferenceController; @@ -208,7 +207,7 @@ public class SliceBroadcastReceiver extends BroadcastReceiver { private void logSliceValueChange(Context context, String sliceKey, int newValue) { FeatureFactory.getFactory(context).getMetricsFeatureProvider() .action(SettingsEnums.PAGE_UNKNOWN, - MetricsEvent.ACTION_SETTINGS_SLICE_CHANGED, + SettingsEnums.ACTION_SETTINGS_SLICE_CHANGED, SettingsEnums.PAGE_UNKNOWN, sliceKey, newValue); } diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java index 925306e7a5e..8b4bb744cc1 100644 --- a/src/com/android/settings/slices/SliceBuilderUtils.java +++ b/src/com/android/settings/slices/SliceBuilderUtils.java @@ -42,7 +42,6 @@ import androidx.slice.builders.ListBuilder.InputRangeBuilder; import androidx.slice.builders.ListBuilder.RowBuilder; import androidx.slice.builders.SliceAction; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SubSettings; @@ -80,7 +79,7 @@ public class SliceBuilderUtils { final BasePreferenceController controller = getPreferenceController(context, sliceData); FeatureFactory.getFactory(context).getMetricsFeatureProvider() .action(SettingsEnums.PAGE_UNKNOWN, - MetricsEvent.ACTION_SETTINGS_SLICE_REQUESTED, + SettingsEnums.ACTION_SETTINGS_SLICE_REQUESTED, SettingsEnums.PAGE_UNKNOWN, sliceData.getKey(), 0); diff --git a/src/com/android/settings/slices/SliceDataConverter.java b/src/com/android/settings/slices/SliceDataConverter.java index dcc80898ca8..69492734908 100644 --- a/src/com/android/settings/slices/SliceDataConverter.java +++ b/src/com/android/settings/slices/SliceDataConverter.java @@ -21,9 +21,9 @@ import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_CONTRO import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_ICON; import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEY; import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_PLATFORM_SLICE_FLAG; -import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_UNAVAILABLE_SLICE_SUBTITLE; import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_SUMMARY; import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_TITLE; +import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_UNAVAILABLE_SLICE_SUBTITLE; import android.accessibilityservice.AccessibilityServiceInfo; import android.content.ComponentName; diff --git a/src/com/android/settings/system/ResetDashboardFragment.java b/src/com/android/settings/system/ResetDashboardFragment.java index 772f18b4f17..5243d6a393b 100644 --- a/src/com/android/settings/system/ResetDashboardFragment.java +++ b/src/com/android/settings/system/ResetDashboardFragment.java @@ -16,10 +16,10 @@ package com.android.settings.system; +import android.app.settings.SettingsEnums; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.manageapplications.ResetAppPrefPreferenceController; import com.android.settings.dashboard.DashboardFragment; @@ -40,7 +40,7 @@ public class ResetDashboardFragment extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.RESET_DASHBOARD; + return SettingsEnums.RESET_DASHBOARD; } @Override diff --git a/src/com/android/settings/system/SystemDashboardFragment.java b/src/com/android/settings/system/SystemDashboardFragment.java index 4f0c738b15d..5c642b234ac 100644 --- a/src/com/android/settings/system/SystemDashboardFragment.java +++ b/src/com/android/settings/system/SystemDashboardFragment.java @@ -15,6 +15,7 @@ */ package com.android.settings.system; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; @@ -23,7 +24,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -53,7 +53,7 @@ public class SystemDashboardFragment extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_SYSTEM_CATEGORY; + return SettingsEnums.SETTINGS_SYSTEM_CATEGORY; } @Override diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java index bd85ef3e242..d4c73180025 100644 --- a/src/com/android/settings/tts/TextToSpeechSettings.java +++ b/src/com/android/settings/tts/TextToSpeechSettings.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Secure.TTS_DEFAULT_PITCH; import static android.provider.Settings.Secure.TTS_DEFAULT_RATE; import static android.provider.Settings.Secure.TTS_DEFAULT_SYNTH; +import android.app.settings.SettingsEnums; import android.content.ActivityNotFoundException; import android.content.ContentResolver; import android.content.Context; @@ -38,7 +39,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.preference.ListPreference; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; @@ -150,7 +150,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.TTS_TEXT_TO_SPEECH; + return SettingsEnums.TTS_TEXT_TO_SPEECH; } @Override diff --git a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java index 27c9547e5e8..43bb4590e27 100644 --- a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java +++ b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java @@ -2,6 +2,7 @@ package com.android.settings.tts; import static android.provider.Settings.Secure.TTS_DEFAULT_SYNTH; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; @@ -13,7 +14,6 @@ import android.widget.Checkable; import androidx.preference.PreferenceCategory; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; @@ -68,7 +68,7 @@ public class TtsEnginePreferenceFragment extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.TTS_ENGINE_SETTINGS; + return SettingsEnums.TTS_ENGINE_SETTINGS; } @Override diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java index 5f899ebe8f5..7b15e8a090b 100644 --- a/src/com/android/settings/users/AppRestrictionsFragment.java +++ b/src/com/android/settings/users/AppRestrictionsFragment.java @@ -17,6 +17,7 @@ package com.android.settings.users; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -53,7 +54,6 @@ import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceViewHolder; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; @@ -244,7 +244,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen @Override public int getMetricsCategory() { - return MetricsEvent.USERS_APP_RESTRICTIONS; + return SettingsEnums.USERS_APP_RESTRICTIONS; } @Override diff --git a/src/com/android/settings/users/AutoSyncDataPreferenceController.java b/src/com/android/settings/users/AutoSyncDataPreferenceController.java index 13a2cdf4652..e7c5cb699a1 100644 --- a/src/com/android/settings/users/AutoSyncDataPreferenceController.java +++ b/src/com/android/settings/users/AutoSyncDataPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.users; import android.app.ActivityManager; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; @@ -31,7 +32,6 @@ import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -147,7 +147,7 @@ public class AutoSyncDataPreferenceController extends AbstractPreferenceControll @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_CONFIRM_AUTO_SYNC_CHANGE; + return SettingsEnums.DIALOG_CONFIRM_AUTO_SYNC_CHANGE; } @Override diff --git a/src/com/android/settings/users/OwnerInfoSettings.java b/src/com/android/settings/users/OwnerInfoSettings.java index 8915a27560e..d06ba64df89 100644 --- a/src/com/android/settings/users/OwnerInfoSettings.java +++ b/src/com/android/settings/users/OwnerInfoSettings.java @@ -17,6 +17,7 @@ package com.android.settings.users; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.os.Bundle; @@ -29,7 +30,6 @@ import android.widget.EditText; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; -import com.android.internal.logging.nano.MetricsProto; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -96,6 +96,6 @@ public class OwnerInfoSettings extends InstrumentedDialogFragment implements OnC @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_OWNER_INFO_SETTINGS; + return SettingsEnums.DIALOG_OWNER_INFO_SETTINGS; } } diff --git a/src/com/android/settings/users/RestrictedProfileSettings.java b/src/com/android/settings/users/RestrictedProfileSettings.java index 99ae26df444..b00ee83f618 100644 --- a/src/com/android/settings/users/RestrictedProfileSettings.java +++ b/src/com/android/settings/users/RestrictedProfileSettings.java @@ -17,6 +17,7 @@ package com.android.settings.users; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.UserInfo; @@ -26,7 +27,6 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; @@ -138,9 +138,9 @@ public class RestrictedProfileSettings extends AppRestrictionsFragment public int getDialogMetricsCategory(int dialogId) { switch (dialogId) { case DIALOG_ID_EDIT_USER_INFO: - return MetricsProto.MetricsEvent.DIALOG_USER_EDIT; + return SettingsEnums.DIALOG_USER_EDIT; case DIALOG_CONFIRM_REMOVE: - return MetricsProto.MetricsEvent.DIALOG_USER_REMOVE; + return SettingsEnums.DIALOG_USER_REMOVE; default: return 0; } diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java index 99d3ca45d95..371c152e157 100644 --- a/src/com/android/settings/users/UserDetailsSettings.java +++ b/src/com/android/settings/users/UserDetailsSettings.java @@ -17,6 +17,7 @@ package com.android.settings.users; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.content.pm.UserInfo; @@ -27,8 +28,6 @@ import android.os.UserManager; import androidx.preference.Preference; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.RestrictedLockUtilsInternal; @@ -70,7 +69,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.USER_DETAILS; + return SettingsEnums.USER_DETAILS; } @Override @@ -198,11 +197,11 @@ public class UserDetailsSettings extends SettingsPreferenceFragment public int getDialogMetricsCategory(int dialogId) { switch (dialogId) { case DIALOG_CONFIRM_REMOVE: - return MetricsProto.MetricsEvent.DIALOG_USER_REMOVE; + return SettingsEnums.DIALOG_USER_REMOVE; case DIALOG_CONFIRM_ENABLE_CALLING: - return MetricsProto.MetricsEvent.DIALOG_USER_ENABLE_CALLING; + return SettingsEnums.DIALOG_USER_ENABLE_CALLING; case DIALOG_CONFIRM_ENABLE_CALLING_AND_SMS: - return MetricsProto.MetricsEvent.DIALOG_USER_ENABLE_CALLING_AND_SMS; + return SettingsEnums.DIALOG_USER_ENABLE_CALLING_AND_SMS; default: return 0; } diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index 5b4055c436b..21552ce2131 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -20,6 +20,7 @@ import android.app.Activity; import android.app.ActivityManager; import android.app.Dialog; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.Context; import android.content.DialogInterface; @@ -56,7 +57,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.UserIcons; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; @@ -205,7 +205,7 @@ public class UserSettings extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.USER; + return SettingsEnums.USER; } @Override @@ -702,23 +702,23 @@ public class UserSettings extends SettingsPreferenceFragment public int getDialogMetricsCategory(int dialogId) { switch (dialogId) { case DIALOG_CONFIRM_REMOVE: - return MetricsEvent.DIALOG_USER_REMOVE; + return SettingsEnums.DIALOG_USER_REMOVE; case DIALOG_USER_CANNOT_MANAGE: - return MetricsEvent.DIALOG_USER_CANNOT_MANAGE; + return SettingsEnums.DIALOG_USER_CANNOT_MANAGE; case DIALOG_ADD_USER: - return MetricsEvent.DIALOG_USER_ADD; + return SettingsEnums.DIALOG_USER_ADD; case DIALOG_SETUP_USER: - return MetricsEvent.DIALOG_USER_SETUP; + return SettingsEnums.DIALOG_USER_SETUP; case DIALOG_SETUP_PROFILE: - return MetricsEvent.DIALOG_USER_SETUP_PROFILE; + return SettingsEnums.DIALOG_USER_SETUP_PROFILE; case DIALOG_CHOOSE_USER_TYPE: - return MetricsEvent.DIALOG_USER_CHOOSE_TYPE; + return SettingsEnums.DIALOG_USER_CHOOSE_TYPE; case DIALOG_NEED_LOCKSCREEN: - return MetricsEvent.DIALOG_USER_NEED_LOCKSCREEN; + return SettingsEnums.DIALOG_USER_NEED_LOCKSCREEN; case DIALOG_CONFIRM_EXIT_GUEST: - return MetricsEvent.DIALOG_USER_CONFIRM_EXIT_GUEST; + return SettingsEnums.DIALOG_USER_CONFIRM_EXIT_GUEST; case DIALOG_USER_PROFILE_EDITOR: - return MetricsEvent.DIALOG_USER_EDIT_PROFILE; + return SettingsEnums.DIALOG_USER_EDIT_PROFILE; default: return 0; } diff --git a/src/com/android/settings/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java index 16f79c2aebe..3ec63c3f5b8 100644 --- a/src/com/android/settings/utils/ManagedServiceSettings.java +++ b/src/com/android/settings/utils/ManagedServiceSettings.java @@ -20,6 +20,7 @@ import android.annotation.Nullable; import android.app.ActivityManager; import android.app.Dialog; import android.app.admin.DevicePolicyManager; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageItemInfo; @@ -32,7 +33,11 @@ import android.util.IconDrawableFactory; import android.util.Log; import android.view.View; -import com.android.internal.logging.nano.MetricsProto; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -42,11 +47,6 @@ import com.android.settingslib.applications.ServiceListing; import java.util.List; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - public abstract class ManagedServiceSettings extends EmptyTextSettings { private static final String TAG = "ManagedServiceSettings"; private final Config mConfig; @@ -193,7 +193,7 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_SERVICE_ACCESS_WARNING; + return SettingsEnums.DIALOG_SERVICE_ACCESS_WARNING; } public ScaryWarningDialogFragment setServiceInfo(ComponentName cn, String label, diff --git a/src/com/android/settings/vpn2/AppDialogFragment.java b/src/com/android/settings/vpn2/AppDialogFragment.java index 0bf5215cebe..0d0022f74ea 100644 --- a/src/com/android/settings/vpn2/AppDialogFragment.java +++ b/src/com/android/settings/vpn2/AppDialogFragment.java @@ -17,6 +17,7 @@ package com.android.settings.vpn2; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.content.pm.PackageInfo; @@ -31,7 +32,6 @@ import android.util.Log; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; -import com.android.internal.logging.nano.MetricsProto; import com.android.internal.net.VpnConfig; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -57,7 +57,7 @@ public class AppDialogFragment extends InstrumentedDialogFragment implements App @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_VPN_APP_CONFIG; + return SettingsEnums.DIALOG_VPN_APP_CONFIG; } public interface Listener { diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java index 6a80a54623c..1571216d53f 100644 --- a/src/com/android/settings/vpn2/AppManagementFragment.java +++ b/src/com/android/settings/vpn2/AppManagementFragment.java @@ -20,6 +20,7 @@ import static android.app.AppOpsManager.OP_ACTIVATE_VPN; import android.annotation.NonNull; import android.app.AppOpsManager; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; @@ -40,7 +41,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; import androidx.preference.Preference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.net.VpnConfig; import com.android.internal.util.ArrayUtils; import com.android.settings.R; @@ -173,7 +173,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.VPN; + return SettingsEnums.VPN; } private boolean onForgetVpnClick() { @@ -335,7 +335,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_VPN_CANNOT_CONNECT; + return SettingsEnums.DIALOG_VPN_CANNOT_CONNECT; } public static void show(AppManagementFragment parent, String vpnLabel) { diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java index 571451554f4..ec927aec2f5 100644 --- a/src/com/android/settings/vpn2/ConfigDialogFragment.java +++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java @@ -17,6 +17,7 @@ package com.android.settings.vpn2; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.net.ConnectivityManager; @@ -33,7 +34,6 @@ import android.widget.Toast; import androidx.appcompat.app.AlertDialog; -import com.android.internal.logging.nano.MetricsProto; import com.android.internal.net.LegacyVpnInfo; import com.android.internal.net.VpnProfile; import com.android.settings.R; @@ -61,7 +61,7 @@ public class ConfigDialogFragment extends InstrumentedDialogFragment implements @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_LEGACY_VPN_CONFIG; + return SettingsEnums.DIALOG_LEGACY_VPN_CONFIG; } public static void show(VpnSettings parent, VpnProfile profile, boolean edit, boolean exists) { diff --git a/src/com/android/settings/vpn2/ConfirmLockdownFragment.java b/src/com/android/settings/vpn2/ConfirmLockdownFragment.java index 08f37523b6c..1e8074c6a4d 100644 --- a/src/com/android/settings/vpn2/ConfirmLockdownFragment.java +++ b/src/com/android/settings/vpn2/ConfirmLockdownFragment.java @@ -16,13 +16,13 @@ package com.android.settings.vpn2; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.os.Bundle; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -36,7 +36,7 @@ public class ConfirmLockdownFragment extends InstrumentedDialogFragment @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_VPN_REPLACE_EXISTING; + return SettingsEnums.DIALOG_VPN_REPLACE_EXISTING; } private static final String ARG_REPLACING = "replacing"; diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java index ed36da840c8..874a9b93b6b 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -22,6 +22,7 @@ import android.annotation.UiThread; import android.annotation.WorkerThread; import android.app.Activity; import android.app.AppOpsManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.pm.PackageInfo; @@ -54,7 +55,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import com.android.internal.annotations.GuardedBy; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.net.LegacyVpnInfo; import com.android.internal.net.VpnConfig; import com.android.internal.net.VpnProfile; @@ -114,7 +114,7 @@ public class VpnSettings extends RestrictedSettingsFragment implements @Override public int getMetricsCategory() { - return MetricsEvent.VPN; + return SettingsEnums.VPN; } @Override diff --git a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java index c0473571337..50819e2f6de 100644 --- a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java +++ b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java @@ -18,6 +18,7 @@ package com.android.settings.wallpaper; import android.app.Activity; import android.app.WallpaperManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -25,7 +26,6 @@ import android.os.Bundle; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; @@ -54,7 +54,7 @@ public class WallpaperSuggestionActivity extends Activity { new SubSettingLauncher(this) .setDestination(WallpaperTypeSettings.class.getName()) .setTitleRes(R.string.wallpaper_suggestion_title) - .setSourceMetricsCategory(MetricsProto.MetricsEvent.DASHBOARD_SUMMARY) + .setSourceMetricsCategory(SettingsEnums.DASHBOARD_SUMMARY) .addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT) .launch(); } diff --git a/src/com/android/settings/wallpaper/WallpaperTypeSettings.java b/src/com/android/settings/wallpaper/WallpaperTypeSettings.java index 1ea0b740905..0e0f8df4448 100644 --- a/src/com/android/settings/wallpaper/WallpaperTypeSettings.java +++ b/src/com/android/settings/wallpaper/WallpaperTypeSettings.java @@ -16,12 +16,12 @@ package com.android.settings.wallpaper; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -37,7 +37,7 @@ public class WallpaperTypeSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.WALLPAPER_TYPE; + return SettingsEnums.WALLPAPER_TYPE; } @Override diff --git a/src/com/android/settings/webview/WebViewAppPicker.java b/src/com/android/settings/webview/WebViewAppPicker.java index 72d79183734..b1dfd1454f9 100644 --- a/src/com/android/settings/webview/WebViewAppPicker.java +++ b/src/com/android/settings/webview/WebViewAppPicker.java @@ -19,6 +19,7 @@ package com.android.settings.webview; import static android.provider.Settings.ACTION_WEBVIEW_SETTINGS; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -30,7 +31,6 @@ import android.webkit.UserPackage; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.defaultapps.DefaultAppPickerFragment; import com.android.settingslib.applications.DefaultAppInfo; @@ -114,7 +114,7 @@ public class WebViewAppPicker extends DefaultAppPickerFragment { @Override public int getMetricsCategory() { - return MetricsEvent.WEBVIEW_IMPLEMENTATION; + return SettingsEnums.WEBVIEW_IMPLEMENTATION; } private static class WebViewAppInfo extends DefaultAppInfo { diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java index 0bd2a1e9631..2698bf4c03a 100755 --- a/src/com/android/settings/wfd/WifiDisplaySettings.java +++ b/src/com/android/settings/wfd/WifiDisplaySettings.java @@ -16,6 +16,7 @@ package com.android.settings.wfd; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.Context; import android.content.DialogInterface; @@ -61,7 +62,6 @@ import androidx.preference.PreferenceViewHolder; import androidx.preference.SwitchPreference; import com.android.internal.app.MediaRouteDialogPresenter; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.dashboard.SummaryLoader; @@ -127,7 +127,7 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment implem @Override public int getMetricsCategory() { - return MetricsEvent.WFD_WIFI_DISPLAY; + return SettingsEnums.WFD_WIFI_DISPLAY; } @Override diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java index 056f6b46f88..c1101079223 100644 --- a/src/com/android/settings/widget/EntityHeaderController.java +++ b/src/com/android/settings/widget/EntityHeaderController.java @@ -16,8 +16,6 @@ package com.android.settings.widget; -import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_OPEN_APP_NOTIFICATION_SETTING; - import android.annotation.IdRes; import android.annotation.UserIdInt; import android.app.ActionBar; @@ -359,7 +357,7 @@ public class EntityHeaderController { button.setOnClickListener(v -> { FeatureFactory.getFactory(mAppContext).getMetricsFeatureProvider() .action(SettingsEnums.PAGE_UNKNOWN, - ACTION_OPEN_APP_NOTIFICATION_SETTING, + SettingsEnums.ACTION_OPEN_APP_NOTIFICATION_SETTING, mMetricsCategory, null, 0); mFragment.startActivity(mAppNotifPrefIntent); diff --git a/src/com/android/settings/widget/RadioButtonPickerFragment.java b/src/com/android/settings/widget/RadioButtonPickerFragment.java index 50c1b58442f..591cd218f84 100644 --- a/src/com/android/settings/widget/RadioButtonPickerFragment.java +++ b/src/com/android/settings/widget/RadioButtonPickerFragment.java @@ -27,7 +27,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Toast; import androidx.annotation.LayoutRes; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; @@ -40,10 +39,11 @@ import com.android.settings.core.PreferenceXmlParserUtils; import com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag; import com.android.settingslib.widget.CandidateInfo; +import org.xmlpull.v1.XmlPullParserException; + import java.io.IOException; import java.util.List; import java.util.Map; -import org.xmlpull.v1.XmlPullParserException; public abstract class RadioButtonPickerFragment extends InstrumentedPreferenceFragment implements RadioButtonPreference.OnClickListener { diff --git a/src/com/android/settings/wifi/AddNetworkFragment.java b/src/com/android/settings/wifi/AddNetworkFragment.java index cd8f76e624a..e4d0fb1ceaa 100644 --- a/src/com/android/settings/wifi/AddNetworkFragment.java +++ b/src/com/android/settings/wifi/AddNetworkFragment.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.Intent; import android.os.Bundle; import android.view.LayoutInflater; @@ -27,7 +28,6 @@ import android.widget.ImageButton; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.InstrumentedFragment; import com.android.settings.wifi.dpp.WifiDppUtils; @@ -52,7 +52,7 @@ public class AddNetworkFragment extends InstrumentedFragment implements WifiConf @Override public int getMetricsCategory() { - return MetricsEvent.SETTINGS_WIFI_ADD_NETWORK; + return SettingsEnums.SETTINGS_WIFI_ADD_NETWORK; } @Override diff --git a/src/com/android/settings/wifi/ButtonPreference.java b/src/com/android/settings/wifi/ButtonPreference.java index 62e8caf1e20..9a0abf60f00 100644 --- a/src/com/android/settings/wifi/ButtonPreference.java +++ b/src/com/android/settings/wifi/ButtonPreference.java @@ -24,13 +24,13 @@ import android.util.Log; import android.view.View; import android.widget.ImageButton; -import com.android.settings.R; - -import androidx.annotation.VisibleForTesting; import androidx.annotation.DrawableRes; +import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; + /** * This preference provides one button layout with Settings style. * It looks like below diff --git a/src/com/android/settings/wifi/ChangeWifiStateDetails.java b/src/com/android/settings/wifi/ChangeWifiStateDetails.java index 63d1745ac1f..9841615a690 100644 --- a/src/com/android/settings/wifi/ChangeWifiStateDetails.java +++ b/src/com/android/settings/wifi/ChangeWifiStateDetails.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import android.app.AppOpsManager; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; @@ -25,7 +26,6 @@ import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.SwitchPreference; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; import com.android.settings.applications.AppStateAppOpsBridge.PermissionState; @@ -69,7 +69,7 @@ public class ChangeWifiStateDetails extends AppInfoWithHeader @Override public int getMetricsCategory() { - return MetricsEvent.CONFIGURE_WIFI; + return SettingsEnums.CONFIGURE_WIFI; } @Override @@ -93,8 +93,8 @@ public class ChangeWifiStateDetails extends AppInfoWithHeader } protected void logSpecialPermissionChange(boolean newState, String packageName) { - int logCategory = newState ? MetricsEvent.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_ALLOW - : MetricsEvent.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_DENY; + int logCategory = newState ? SettingsEnums.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_ALLOW + : SettingsEnums.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_DENY; FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider().action(getContext(), logCategory, packageName); } diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java index 8df4a41691a..89c157587a2 100644 --- a/src/com/android/settings/wifi/ConfigureWifiSettings.java +++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import static android.content.Context.WIFI_SERVICE; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.net.ConnectivityManager; @@ -24,7 +25,6 @@ import android.net.NetworkInfo; import android.net.wifi.WifiManager; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -50,7 +50,7 @@ public class ConfigureWifiSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsEvent.CONFIGURE_WIFI; + return SettingsEnums.CONFIGURE_WIFI; } @Override diff --git a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java index 06e36e5caa9..0ed85447c2e 100644 --- a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java +++ b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java @@ -17,32 +17,31 @@ package com.android.settings.wifi; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.graphics.drawable.Drawable; import android.net.wifi.ScanResult; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; -import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback; import android.net.wifi.WifiManager.NetworkRequestMatchCallback; +import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback; +import android.os.Bundle; import android.os.Handler; import android.os.Message; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ArrayAdapter; import android.widget.BaseAdapter; +import android.widget.ProgressBar; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; import androidx.preference.internal.PreferenceImageView; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ArrayAdapter; -import android.widget.ProgressBar; -import android.widget.TextView; - -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE; @@ -255,7 +254,7 @@ public class NetworkRequestDialogFragment extends InstrumentedDialogFragment imp @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.WIFI_SCANNING_NEEDED_DIALOG; + return SettingsEnums.WIFI_SCANNING_NEEDED_DIALOG; } private class AccessPointAdapter extends ArrayAdapter { diff --git a/src/com/android/settings/wifi/NetworkRequestErrorDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestErrorDialogFragment.java index 762b467b4c5..261d3131e49 100644 --- a/src/com/android/settings/wifi/NetworkRequestErrorDialogFragment.java +++ b/src/com/android/settings/wifi/NetworkRequestErrorDialogFragment.java @@ -17,13 +17,13 @@ package com.android.settings.wifi; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.os.Bundle; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -75,7 +75,7 @@ public class NetworkRequestErrorDialogFragment extends InstrumentedDialogFragmen @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.WIFI_SCANNING_NEEDED_DIALOG; + return SettingsEnums.WIFI_SCANNING_NEEDED_DIALOG; } protected void startScanningDialog() { diff --git a/src/com/android/settings/wifi/WifiAPITest.java b/src/com/android/settings/wifi/WifiAPITest.java index c0b90f9fe5a..87499f58913 100644 --- a/src/com/android/settings/wifi/WifiAPITest.java +++ b/src/com/android/settings/wifi/WifiAPITest.java @@ -18,6 +18,7 @@ package com.android.settings.wifi; import static android.content.Context.WIFI_SERVICE; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.net.wifi.WifiManager; import android.os.Bundle; @@ -28,7 +29,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -87,7 +87,7 @@ public class WifiAPITest extends SettingsPreferenceFragment implements @Override public int getMetricsCategory() { - return MetricsEvent.TESTING; + return SettingsEnums.TESTING; } //============================ diff --git a/src/com/android/settings/wifi/WifiConnectionPreferenceController.java b/src/com/android/settings/wifi/WifiConnectionPreferenceController.java index b73bce981c2..33eacebee41 100644 --- a/src/com/android/settings/wifi/WifiConnectionPreferenceController.java +++ b/src/com/android/settings/wifi/WifiConnectionPreferenceController.java @@ -19,6 +19,9 @@ package com.android.settings.wifi; import android.content.Context; import android.os.Bundle; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settings.wifi.details.WifiNetworkDetailsFragment; @@ -29,9 +32,6 @@ import com.android.settingslib.wifi.AccessPointPreference; import com.android.settingslib.wifi.WifiTracker; import com.android.settingslib.wifi.WifiTrackerFactory; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - /** * This places a preference into a PreferenceGroup owned by some parent * controller class when there is a wifi connection present. diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java index 0bee671e2e0..9420c4c8ae6 100644 --- a/src/com/android/settings/wifi/WifiDialog.java +++ b/src/com/android/settings/wifi/WifiDialog.java @@ -27,7 +27,6 @@ import androidx.appcompat.app.AlertDialog; import com.android.settings.R; import com.android.settings.wifi.dpp.WifiDppUtils; - import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.wifi.AccessPoint; diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java index 60480c2d903..536ea613b59 100644 --- a/src/com/android/settings/wifi/WifiEnabler.java +++ b/src/com/android/settings/wifi/WifiEnabler.java @@ -16,6 +16,7 @@ package com.android.settings.wifi; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -32,7 +33,6 @@ import android.widget.Toast; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.widget.SwitchWidgetController; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; @@ -209,10 +209,10 @@ public class WifiEnabler implements SwitchWidgetController.OnSwitchChangeListene } if (isChecked) { - mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_WIFI_ON); + mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_WIFI_ON); } else { // Log if user was connected at the time of switching off. - mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_WIFI_OFF, + mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_WIFI_OFF, mConnected.get()); } if (!mWifiManager.setWifiEnabled(isChecked)) { diff --git a/src/com/android/settings/wifi/WifiInfo.java b/src/com/android/settings/wifi/WifiInfo.java index 3f57376f60c..a131f186370 100644 --- a/src/com/android/settings/wifi/WifiInfo.java +++ b/src/com/android/settings/wifi/WifiInfo.java @@ -16,9 +16,9 @@ package com.android.settings.wifi; +import android.app.settings.SettingsEnums; import android.os.Bundle; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -36,6 +36,6 @@ public class WifiInfo extends SettingsPreferenceFragment { @Override public int getMetricsCategory() { - return MetricsEvent.TESTING; + return SettingsEnums.TESTING; } } diff --git a/src/com/android/settings/wifi/WifiScanModeActivity.java b/src/com/android/settings/wifi/WifiScanModeActivity.java index a9be6a3c2a4..934e9724a06 100644 --- a/src/com/android/settings/wifi/WifiScanModeActivity.java +++ b/src/com/android/settings/wifi/WifiScanModeActivity.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -29,7 +30,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentActivity; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -126,7 +126,7 @@ public class WifiScanModeActivity extends FragmentActivity { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_WIFI_SCAN_MODE; + return SettingsEnums.DIALOG_WIFI_SCAN_MODE; } @Override diff --git a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java index fd279cc1e69..fa9b21a518e 100644 --- a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java +++ b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import android.app.Activity; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.ActivityNotFoundException; import android.content.ContentResolver; import android.content.Context; @@ -31,7 +32,6 @@ import android.widget.Toast; import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settingslib.HelpUtils; @@ -60,7 +60,7 @@ public class WifiScanningRequiredFragment extends InstrumentedDialogFragment imp @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.WIFI_SCANNING_NEEDED_DIALOG; + return SettingsEnums.WIFI_SCANNING_NEEDED_DIALOG; } @Override diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 973697fecdb..3a0040c385e 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -22,6 +22,7 @@ import static android.os.UserManager.DISALLOW_CONFIG_WIFI; import android.annotation.NonNull; import android.app.Activity; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; @@ -52,7 +53,6 @@ import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.LinkifyUtils; import com.android.settings.R; import com.android.settings.RestrictedSettingsFragment; @@ -446,7 +446,7 @@ public class WifiSettings extends RestrictedSettingsFragment @Override public int getMetricsCategory() { - return MetricsEvent.WIFI; + return SettingsEnums.WIFI; } @Override @@ -657,9 +657,9 @@ public class WifiSettings extends RestrictedSettingsFragment public int getDialogMetricsCategory(int dialogId) { switch (dialogId) { case WIFI_DIALOG_ID: - return MetricsEvent.DIALOG_WIFI_AP_EDIT; + return SettingsEnums.DIALOG_WIFI_AP_EDIT; case WRITE_NFC_DIALOG_ID: - return MetricsEvent.DIALOG_WIFI_WRITE_NFC; + return SettingsEnums.DIALOG_WIFI_WRITE_NFC; default: return 0; } @@ -1089,7 +1089,7 @@ public class WifiSettings extends RestrictedSettingsFragment } /* package */ void forget() { - mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_WIFI_FORGET); + mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_WIFI_FORGET); if (!mSelectedAccessPoint.isSaved()) { if (mSelectedAccessPoint.getNetworkInfo() != null && mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) { @@ -1115,7 +1115,7 @@ public class WifiSettings extends RestrictedSettingsFragment protected void connect(final WifiConfiguration config, boolean isSavedNetwork) { // Log subtype if configuration is a saved network. - mMetricsFeatureProvider.action(getContext(), MetricsEvent.ACTION_WIFI_CONNECT, + mMetricsFeatureProvider.action(getContext(), SettingsEnums.ACTION_WIFI_CONNECT, isSavedNetwork); mWifiManager.connect(config, mConnectListener); mClickedConnect = true; @@ -1123,7 +1123,7 @@ public class WifiSettings extends RestrictedSettingsFragment protected void connect(final int networkId, boolean isSavedNetwork) { // Log subtype if configuration is a saved network. - mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_WIFI_CONNECT, + mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_WIFI_CONNECT, isSavedNetwork); mWifiManager.connect(networkId, mConnectListener); } diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettings.java b/src/com/android/settings/wifi/calling/WifiCallingSettings.java index ecb96a5d2a9..b02d6c60b4f 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSettings.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSettings.java @@ -16,6 +16,7 @@ package com.android.settings.wifi.calling; +import android.app.settings.SettingsEnums; import android.os.Bundle; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; @@ -29,7 +30,6 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; import com.android.ims.ImsManager; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.InstrumentedFragment; import com.android.settings.search.actionbar.SearchMenuController; @@ -55,7 +55,7 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes @Override public int getMetricsCategory() { - return MetricsEvent.WIFI_CALLING; + return SettingsEnums.WIFI_CALLING; } @Override diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java index 0de5c77dd11..40cc0dcdf7f 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java @@ -17,6 +17,7 @@ package com.android.settings.wifi.calling; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -44,7 +45,6 @@ import androidx.preference.PreferenceScreen; import com.android.ims.ImsConfig; import com.android.ims.ImsManager; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.Phone; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -212,7 +212,7 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsEvent.WIFI_CALLING_FOR_SUB; + return SettingsEnums.WIFI_CALLING_FOR_SUB; } @Override diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java index 4387459845c..a49ce40edf4 100644 --- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java @@ -21,6 +21,7 @@ import static android.net.NetworkCapabilities.TRANSPORT_WIFI; import android.app.Activity; import android.app.KeyguardManager; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -53,17 +54,15 @@ import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.FeatureFlags; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.widget.EntityHeaderController; -import com.android.settings.wifi.dpp.WifiDppConfiguratorActivity; -import com.android.settings.wifi.dpp.WifiDppUtils; import com.android.settings.wifi.WifiDialog; import com.android.settings.wifi.WifiDialog.WifiDialogListener; import com.android.settings.wifi.WifiUtils; +import com.android.settings.wifi.dpp.WifiDppUtils; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -551,7 +550,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController } } mMetricsFeatureProvider.action( - mFragment.getActivity(), MetricsProto.MetricsEvent.ACTION_WIFI_FORGET); + mFragment.getActivity(), SettingsEnums.ACTION_WIFI_FORGET); mFragment.getActivity().finish(); } @@ -593,7 +592,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController */ private void signIntoNetwork() { mMetricsFeatureProvider.action( - mFragment.getActivity(), MetricsProto.MetricsEvent.ACTION_WIFI_SIGNIN); + mFragment.getActivity(), SettingsEnums.ACTION_WIFI_SIGNIN); mConnectivityManager.startCaptivePortalApp(mNetwork); } diff --git a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java index 98144864620..2f45526e3a6 100644 --- a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java +++ b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java @@ -19,6 +19,7 @@ import static com.android.settings.wifi.WifiSettings.WIFI_DIALOG_ID; import android.app.Activity; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.net.ConnectivityManager; @@ -30,8 +31,6 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import com.android.internal.logging.nano.MetricsProto; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.wifi.WifiConfigUiBase; @@ -67,7 +66,7 @@ public class WifiNetworkDetailsFragment extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.WIFI_NETWORK_DETAILS; + return SettingsEnums.WIFI_NETWORK_DETAILS; } @Override @@ -83,7 +82,7 @@ public class WifiNetworkDetailsFragment extends DashboardFragment { @Override public int getDialogMetricsCategory(int dialogId) { if (dialogId == WIFI_DIALOG_ID) { - return MetricsEvent.DIALOG_WIFI_AP_EDIT; + return SettingsEnums.DIALOG_WIFI_AP_EDIT; } return 0; } diff --git a/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java b/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java index df20caaef75..1181f44c4b4 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java +++ b/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java @@ -18,6 +18,7 @@ package com.android.settings.wifi.dpp; import android.app.ActionBar; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.Context; import android.net.wifi.WifiManager; import android.os.Bundle; @@ -28,9 +29,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.ImageView; -import android.widget.ProgressBar; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; /** @@ -82,7 +81,7 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_CONFIGURATOR; + return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR; } @Override diff --git a/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java b/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java index 5694ad66820..b39651284e4 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java +++ b/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java @@ -18,6 +18,7 @@ package com.android.settings.wifi.dpp; import android.app.ActionBar; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -28,7 +29,6 @@ import android.widget.ListView; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; /** @@ -44,7 +44,7 @@ public class WifiDppChooseSavedWifiNetworkFragment extends WifiDppQrCodeBaseFrag @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_CONFIGURATOR; + return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR; } @Override diff --git a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java index 51777c59518..d9daf5d42fc 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java +++ b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java @@ -18,6 +18,7 @@ package com.android.settings.wifi.dpp; import android.app.ActionBar; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.Intent; import android.os.Bundle; import android.util.Log; @@ -27,9 +28,8 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.core.InstrumentedActivity; import com.android.settings.R; +import com.android.settings.core.InstrumentedActivity; /** * To provision "other" device with specified Wi-Fi network. @@ -83,7 +83,7 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_CONFIGURATOR; + return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR; } @Override diff --git a/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java b/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java index 66f75fa742c..2d681f15a1c 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java +++ b/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java @@ -16,23 +16,23 @@ package com.android.settings.wifi.dpp; -import android.content.Context; -import android.net.wifi.WifiConfiguration; -import android.provider.Settings; import android.app.ActionBar; import android.app.Activity; +import android.app.settings.SettingsEnums; +import android.content.Context; import android.content.Intent; +import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.os.Bundle; +import android.provider.Settings; import android.util.Log; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.core.InstrumentedActivity; import com.android.settings.R; +import com.android.settings.core.InstrumentedActivity; import java.util.List; @@ -89,7 +89,7 @@ public class WifiDppEnrolleeActivity extends InstrumentedActivity implements @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_ENROLLEE; + return SettingsEnums.SETTINGS_WIFI_DPP_ENROLLEE; } @Override diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java index 4ac5850ee2e..cd0db62e75e 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java +++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java @@ -22,7 +22,6 @@ import android.widget.ImageView; import android.widget.TextView; import com.android.settings.core.InstrumentedFragment; -import com.android.settings.R; /** * There are below 4 fragments for Wi-Fi DPP UI flow, to reduce redundant code of UI components, diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java index f4bbcc10b85..f2ca24edaf8 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java +++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java @@ -17,6 +17,7 @@ package com.android.settings.wifi.dpp; import android.app.ActionBar; +import android.app.settings.SettingsEnums; import android.content.Context; import android.graphics.Bitmap; import android.os.Bundle; @@ -29,7 +30,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.wifi.qrcode.QrCodeGenerator; @@ -47,7 +47,7 @@ public class WifiDppQrCodeGeneratorFragment extends WifiDppQrCodeBaseFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_CONFIGURATOR; + return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR; } // Container Activity must implement this interface diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java index 21534dc8e53..7beeeb2c870 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java +++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java @@ -17,9 +17,8 @@ package com.android.settings.wifi.dpp; import android.app.ActionBar; -import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.Context; -import android.content.Intent; import android.graphics.Matrix; import android.graphics.Rect; import android.graphics.SurfaceTexture; @@ -37,7 +36,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.wifi.qrcode.QrCamera; import com.android.settings.wifi.qrcode.QrDecorateView; @@ -92,9 +90,9 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl @Override public int getMetricsCategory() { if (mIsConfiguratorMode) { - return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_CONFIGURATOR; + return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR; } else { - return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_ENROLLEE; + return SettingsEnums.SETTINGS_WIFI_DPP_ENROLLEE; } } diff --git a/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java b/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java index 3117a10b8d4..7ea4906cc78 100644 --- a/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java +++ b/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java @@ -17,6 +17,7 @@ package com.android.settings.wifi.dpp; import android.app.Activity; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.net.NetworkInfo.DetailedState; @@ -27,10 +28,13 @@ import android.util.Log; import android.view.View; import android.widget.Toast; -import com.android.internal.logging.nano.MetricsProto; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; + import com.android.settings.R; -import com.android.settings.core.SubSettingLauncher; import com.android.settings.SettingsPreferenceFragment; +import com.android.settings.core.SubSettingLauncher; import com.android.settings.wifi.AddNetworkFragment; import com.android.settingslib.wifi.AccessPoint; import com.android.settingslib.wifi.AccessPointPreference; @@ -39,10 +43,6 @@ import com.android.settingslib.wifi.WifiTrackerFactory; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; - public class WifiNetworkListFragment extends SettingsPreferenceFragment implements WifiTracker.WifiListener, AccessPoint.AccessPointListener { private static final String TAG = "WifiNetworkListFragment"; @@ -74,7 +74,7 @@ public class WifiNetworkListFragment extends SettingsPreferenceFragment implemen @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.SETTINGS_WIFI_DPP_CONFIGURATOR; + return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR; } @Override diff --git a/src/com/android/settings/wifi/dpp/WifiQrCode.java b/src/com/android/settings/wifi/dpp/WifiQrCode.java index b60289f130b..5ccb81e0203 100644 --- a/src/com/android/settings/wifi/dpp/WifiQrCode.java +++ b/src/com/android/settings/wifi/dpp/WifiQrCode.java @@ -16,7 +16,6 @@ package com.android.settings.wifi.dpp; -import android.content.Intent; import android.net.wifi.WifiConfiguration; import android.text.TextUtils; diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java index bfdcb215dbc..d1500e7092e 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java @@ -18,6 +18,7 @@ package com.android.settings.wifi.p2p; import android.app.Activity; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.Context; import android.content.DialogInterface; @@ -50,7 +51,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settingslib.core.AbstractPreferenceController; @@ -165,7 +165,7 @@ public class WifiP2pSettings extends DashboardFragment @Override public int getMetricsCategory() { - return MetricsEvent.WIFI_P2P; + return SettingsEnums.WIFI_P2P; } @Override @@ -507,13 +507,13 @@ public class WifiP2pSettings extends DashboardFragment public int getDialogMetricsCategory(int dialogId) { switch (dialogId) { case DIALOG_DISCONNECT: - return MetricsEvent.DIALOG_WIFI_P2P_DISCONNECT; + return SettingsEnums.DIALOG_WIFI_P2P_DISCONNECT; case DIALOG_CANCEL_CONNECT: - return MetricsEvent.DIALOG_WIFI_P2P_CANCEL_CONNECT; + return SettingsEnums.DIALOG_WIFI_P2P_CANCEL_CONNECT; case DIALOG_RENAME: - return MetricsEvent.DIALOG_WIFI_P2P_RENAME; + return SettingsEnums.DIALOG_WIFI_P2P_RENAME; case DIALOG_DELETE_GROUP: - return MetricsEvent.DIALOG_WIFI_P2P_DELETE_GROUP; + return SettingsEnums.DIALOG_WIFI_P2P_DELETE_GROUP; } return 0; } diff --git a/src/com/android/settings/wifi/qrcode/QrCamera.java b/src/com/android/settings/wifi/qrcode/QrCamera.java index af366bc731b..45de6b5147c 100644 --- a/src/com/android/settings/wifi/qrcode/QrCamera.java +++ b/src/com/android/settings/wifi/qrcode/QrCamera.java @@ -24,7 +24,6 @@ import android.graphics.SurfaceTexture; import android.hardware.Camera; import android.hardware.Camera.CameraInfo; import android.hardware.Camera.Parameters; -import android.hardware.Camera.PreviewCallback; import android.os.AsyncTask; import android.os.Handler; import android.os.Message; @@ -33,6 +32,9 @@ import android.util.Log; import android.util.Size; import android.view.Surface; import android.view.WindowManager; + +import androidx.annotation.VisibleForTesting; + import com.google.zxing.BarcodeFormat; import com.google.zxing.BinaryBitmap; import com.google.zxing.DecodeHintType; @@ -40,6 +42,7 @@ import com.google.zxing.MultiFormatReader; import com.google.zxing.ReaderException; import com.google.zxing.Result; import com.google.zxing.common.HybridBinarizer; + import java.io.IOException; import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -48,8 +51,6 @@ import java.util.Map; import java.util.concurrent.Executors; import java.util.concurrent.Semaphore; -import androidx.annotation.VisibleForTesting; - /** * Manage the camera for the QR scanner and help the decoder to get the image inside the scanning * frame. Caller prepares a {@link SurfaceTexture} then call {@link #start(SurfaceTexture)} to diff --git a/src/com/android/settings/wifi/qrcode/QrDecorateView.java b/src/com/android/settings/wifi/qrcode/QrDecorateView.java index 6952a63fafd..2be1eaba0dc 100644 --- a/src/com/android/settings/wifi/qrcode/QrDecorateView.java +++ b/src/com/android/settings/wifi/qrcode/QrDecorateView.java @@ -19,12 +19,9 @@ package com.android.settings.wifi.qrcode; import android.content.Context; import android.graphics.Bitmap; import android.graphics.Canvas; -import android.graphics.Color; import android.graphics.Paint; -import android.graphics.Point; import android.graphics.PorterDuff; import android.graphics.PorterDuffXfermode; -import android.graphics.Rect; import android.graphics.RectF; import android.util.AttributeSet; import android.util.TypedValue; diff --git a/src/com/android/settings/wifi/qrcode/QrPreviewLayout.java b/src/com/android/settings/wifi/qrcode/QrPreviewLayout.java index 56566aeefb6..ad1714664c5 100644 --- a/src/com/android/settings/wifi/qrcode/QrPreviewLayout.java +++ b/src/com/android/settings/wifi/qrcode/QrPreviewLayout.java @@ -18,7 +18,6 @@ package com.android.settings.wifi.qrcode; import android.content.Context; import android.util.AttributeSet; -import android.util.Log; import android.widget.FrameLayout; /** diff --git a/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettings.java index 8f14ec21d70..7b2574f0b67 100644 --- a/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettings.java +++ b/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettings.java @@ -18,14 +18,13 @@ package com.android.settings.wifi.savedaccesspoints; import android.annotation.Nullable; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.net.wifi.WifiManager; import android.os.Bundle; import android.util.Log; -import com.android.internal.logging.nano.MetricsProto; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.wifi.WifiConfigUiBase; @@ -51,7 +50,7 @@ public class SavedAccessPointsWifiSettings extends DashboardFragment @Override public int getMetricsCategory() { - return MetricsEvent.WIFI_SAVED_ACCESS_POINTS; + return SettingsEnums.WIFI_SAVED_ACCESS_POINTS; } @Override @@ -123,7 +122,7 @@ public class SavedAccessPointsWifiSettings extends DashboardFragment public int getDialogMetricsCategory(int dialogId) { switch (dialogId) { case WifiSettings.WIFI_DIALOG_ID: - return MetricsProto.MetricsEvent.DIALOG_WIFI_SAVED_AP_EDIT; + return SettingsEnums.DIALOG_WIFI_SAVED_AP_EDIT; default: return 0; } diff --git a/src/com/android/settings/wifi/slice/WifiSlice.java b/src/com/android/settings/wifi/slice/WifiSlice.java index 35bb89f0111..1c79c1d92b4 100644 --- a/src/com/android/settings/wifi/slice/WifiSlice.java +++ b/src/com/android/settings/wifi/slice/WifiSlice.java @@ -23,6 +23,7 @@ import static com.android.settings.slices.CustomSliceRegistry.WIFI_SLICE_URI; import android.annotation.ColorInt; import android.app.PendingIntent; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.net.Uri; @@ -38,7 +39,6 @@ import androidx.slice.Slice; import androidx.slice.builders.ListBuilder; import androidx.slice.builders.SliceAction; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SubSettings; import com.android.settings.Utils; @@ -174,7 +174,7 @@ public class WifiSlice implements CustomSliceable { .setTitleRes(R.string.pref_title_network_details) .setDestination(WifiNetworkDetailsFragment.class.getName()) .setArguments(extras) - .setSourceMetricsCategory(MetricsEvent.WIFI) + .setSourceMetricsCategory(SettingsEnums.WIFI) .toIntent(); } else { intent = new Intent(mContext, WifiDialogActivity.class); @@ -204,7 +204,7 @@ public class WifiSlice implements CustomSliceable { final Uri contentUri = new Uri.Builder().appendPath(KEY_WIFI).build(); final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext, WifiSettings.class.getName(), KEY_WIFI, screenTitle, - MetricsEvent.DIALOG_WIFI_AP_EDIT) + SettingsEnums.DIALOG_WIFI_AP_EDIT) .setClassName(mContext.getPackageName(), SubSettings.class.getName()) .setData(contentUri); diff --git a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java index c0a3fa73014..eb6a123a3fe 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.net.wifi.WifiConfiguration; -import android.util.Log; import androidx.annotation.VisibleForTesting; import androidx.preference.EditTextPreference; diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java index 5f23f0c0d79..aecc0530338 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java @@ -19,6 +19,7 @@ package com.android.settings.wifi.tether; import static android.net.ConnectivityManager.ACTION_TETHER_STATE_CHANGED; import static android.net.wifi.WifiManager.WIFI_AP_STATE_CHANGED_ACTION; +import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -32,7 +33,6 @@ import android.util.Log; import androidx.annotation.VisibleForTesting; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.dashboard.RestrictedDashboardFragment; @@ -87,7 +87,7 @@ public class WifiTetherSettings extends RestrictedDashboardFragment @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.WIFI_TETHER_SETTINGS; + return SettingsEnums.WIFI_TETHER_SETTINGS; } @Override