From de117046adb6e8c6f0d32f53778f8eaa34e718b0 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Tue, 4 Sep 2018 13:52:15 -0700 Subject: [PATCH] DO NOT MERGE Import clean up. Reordered all imports according to Android codestyle. Test: rebuild Change-Id: I750f01f70f2114d51838bf652833aebdc4065c98 --- .../AccessiblePreferenceCategory.java | 1 + .../settings/BrightnessPreference.java | 3 +- .../settings/CancellablePreference.java | 5 +- .../settings/CustomListPreference.java | 5 +- src/com/android/settings/FallbackHome.java | 5 +- src/com/android/settings/IccLockSettings.java | 6 ++- src/com/android/settings/LegalSettings.java | 2 +- src/com/android/settings/MasterClear.java | 3 +- .../android/settings/MasterClearConfirm.java | 4 +- .../android/settings/PreviewPagerAdapter.java | 4 +- .../PreviewSeekBarPreferenceFragment.java | 5 +- src/com/android/settings/PrivacySettings.java | 10 ++-- .../android/settings/ProgressCategory.java | 5 +- .../settings/ProgressCategoryBase.java | 3 +- src/com/android/settings/RadioInfo.java | 16 ++---- .../RegulatoryInfoDisplayActivity.java | 3 +- .../settings/RemoteBugreportActivity.java | 3 -- .../android/settings/ResetNetworkConfirm.java | 4 +- .../android/settings/RestrictedCheckBox.java | 2 - .../settings/RestrictedListPreference.java | 13 ++--- .../settings/RestrictedRadioButton.java | 6 +-- .../settings/RestrictedSettingsFragment.java | 7 +-- .../android/settings/RingtonePreference.java | 5 +- .../android/settings/SettingsActivity.java | 11 ++-- .../android/settings/SettingsInitialize.java | 17 +++--- .../settings/SettingsLicenseActivity.java | 5 +- .../settings/SettingsPreferenceFragment.java | 15 +++--- .../settings/SetupRedactionInterstitial.java | 1 - .../android/settings/SetupWizardUtils.java | 1 + .../android/settings/SummaryPreference.java | 5 +- src/com/android/settings/TestingSettings.java | 1 + .../TestingSettingsBroadcastReceiver.java | 4 +- src/com/android/settings/TetherSettings.java | 3 +- .../settings/TimeoutListPreference.java | 4 +- .../settings/TrustedCredentialsSettings.java | 2 +- .../settings/UserCredentialsSettings.java | 4 +- src/com/android/settings/Utils.java | 7 +-- .../AccessibilityServiceWarning.java | 4 +- .../accessibility/AccessibilitySettings.java | 13 ++--- .../AccessibilitySettingsForSetupWizard.java | 3 +- ...ibilitySettingsForSetupWizardActivity.java | 5 +- ...cessibilityShortcutPreferenceFragment.java | 5 +- .../CaptionPropertiesFragment.java | 9 ++-- .../accessibility/ColorPreference.java | 3 +- .../DividerAllowedBelowPreference.java | 3 +- ...FeedbackIntensityPreferenceController.java | 1 + .../accessibility/LocalePreference.java | 3 +- ...ificationGesturesPreferenceController.java | 3 +- ...gnificationNavbarPreferenceController.java | 3 +- .../MagnificationPreferenceFragment.java | 5 +- ...ibrationIntensityPreferenceController.java | 1 + ...tificationVibrationPreferenceFragment.java | 1 - .../ShortcutServicePickerFragment.java | 10 ++-- ...ccessibilityServicePreferenceFragment.java | 2 - .../ToggleAutoclickPreferenceFragment.java | 3 +- .../ToggleDaltonizerPreferenceFragment.java | 5 +- .../ToggleFeaturePreferenceFragment.java | 3 +- .../ToggleFontSizePreferenceFragment.java | 1 + ...ScreenMagnificationPreferenceFragment.java | 7 +-- ...ationPreferenceFragmentForSetupWizard.java | 1 - .../TouchVibrationPreferenceFragment.java | 2 - ...ibrationIntensityPreferenceController.java | 1 + .../VibrationPreferenceFragment.java | 5 +- .../AccountDetailDashboardFragment.java | 1 + .../AccountHeaderPreferenceController.java | 1 + .../settings/accounts/AccountPreference.java | 5 +- .../accounts/AccountPreferenceController.java | 9 ++-- .../accounts/AccountRestrictionHelper.java | 2 + .../AccountSyncPreferenceController.java | 1 + .../accounts/AccountSyncSettings.java | 3 +- .../accounts/AccountTypePreference.java | 1 + .../accounts/AccountTypePreferenceLoader.java | 7 +-- .../accounts/ChooseAccountActivity.java | 4 +- .../EmergencyInfoPreferenceController.java | 1 + .../accounts/ManagedProfileSettings.java | 9 ++-- .../RemoveAccountPreferenceController.java | 3 +- .../accounts/SyncStateSwitchPreference.java | 5 +- .../applications/AppInfoWithHeader.java | 3 +- .../applications/AppLaunchSettings.java | 17 +++--- .../applications/AppStateAppOpsBridge.java | 3 +- .../AppStateInstallAppsBridge.java | 1 - .../AppStateNotificationBridge.java | 1 - .../applications/AppStateSmsPremBridge.java | 1 + .../applications/AppStorageSettings.java | 11 ++-- .../AppStorageSizesController.java | 3 +- .../applications/ClearDefaultsPreference.java | 7 +-- .../applications/ConfirmConvertToFbe.java | 1 - .../applications/DataSaverController.java | 3 +- .../DeviceAdministratorsController.java | 3 +- .../applications/DirectoryAccessDetails.java | 34 ++++++------ .../EnabledVrListenersController.java | 3 +- .../applications/HighPowerAppsController.java | 3 +- .../applications/InstalledAppCounter.java | 2 +- .../applications/LayoutPreference.java | 9 ++-- .../applications/ManageDomainUrls.java | 7 +-- .../applications/PremiumSmsAccess.java | 3 +- .../applications/PremiumSmsController.java | 3 +- .../applications/ProcStatsPackageEntry.java | 2 +- .../applications/ProcessStatsDetail.java | 9 ++-- .../applications/ProcessStatsPreference.java | 2 +- .../applications/ProcessStatsSummary.java | 5 +- .../settings/applications/ProcessStatsUi.java | 5 +- .../RecentAppsPreferenceController.java | 9 ++-- .../applications/SpacePreference.java | 6 ++- .../applications/SpecialAccessSettings.java | 5 +- .../SpecialAppAccessPreferenceController.java | 2 + .../applications/UsageAccessDetails.java | 7 +-- .../AppActionButtonPreferenceController.java | 5 +- .../AppBatteryPreferenceController.java | 1 + .../AppDataUsagePreferenceController.java | 5 +- .../AppHeaderViewPreferenceController.java | 1 + .../appinfo/AppInfoDashboardFragment.java | 3 +- .../AppInfoPreferenceControllerBase.java | 3 +- .../AppInstallerInfoPreferenceController.java | 1 + .../AppMemoryPreferenceController.java | 3 +- .../AppNotificationPreferenceController.java | 1 + .../AppOpenByDefaultPreferenceController.java | 1 + .../AppPermissionPreferenceController.java | 3 +- .../AppSettingPreferenceController.java | 3 +- .../AppStoragePreferenceController.java | 3 +- ...ltAppShortcutPreferenceControllerBase.java | 3 +- .../appinfo/DrawOverlayDetails.java | 10 ++-- ...ernalSourceDetailPreferenceController.java | 1 + .../appinfo/ExternalSourcesDetails.java | 1 + ...InstantAppButtonsPreferenceController.java | 4 +- ...InstantAppDomainsPreferenceController.java | 1 + ...reInPictureDetailPreferenceController.java | 3 +- .../appinfo/PictureInPictureDetails.java | 11 ++-- .../appinfo/PictureInPictureSettings.java | 7 +-- .../TimeSpentInAppPreferenceController.java | 3 +- .../appinfo/WriteSettingsDetails.java | 6 +-- .../appops/BackgroundCheckSummary.java | 2 +- .../AssistContextPreferenceController.java | 1 + ...AssistFlashScreenPreferenceController.java | 1 + .../AssistScreenshotPreferenceController.java | 1 + .../assist/AssistSettingObserver.java | 1 + .../assist/DefaultAssistPicker.java | 1 - .../DefaultAssistPreferenceController.java | 1 + ...DefaultVoiceInputPreferenceController.java | 3 +- .../DefaultAppPreferenceController.java | 3 +- .../defaultapps/DefaultAutofillPicker.java | 3 +- .../defaultapps/DefaultBrowserPicker.java | 4 +- .../DefaultBrowserPreferenceController.java | 3 +- ...ltPaymentSettingsPreferenceController.java | 1 + .../manageapplications/AppFilterRegistry.java | 2 +- .../ApplicationViewHolder.java | 7 +-- .../ManageApplications.java | 11 ++-- .../MusicViewHolderController.java | 3 +- .../PhotosViewHolderController.java | 3 +- .../ResetAppPrefPreferenceController.java | 3 +- .../backup/BackupSettingsActivity.java | 4 +- .../backup/BackupSettingsFragment.java | 1 - .../settings/backup/BackupSettingsHelper.java | 3 +- .../BackupSettingsPreferenceController.java | 1 + .../backup/ToggleBackupSettingFragment.java | 7 +-- .../bluetooth/AlwaysDiscoverable.java | 6 +-- .../AvailableMediaBluetoothDeviceUpdater.java | 7 +-- .../BluetoothDetailsButtonsController.java | 1 + .../bluetooth/BluetoothDetailsController.java | 1 + .../BluetoothDetailsHeaderController.java | 6 +-- .../BluetoothDetailsMacAddressController.java | 1 + .../BluetoothDetailsProfilesController.java | 7 +-- .../BluetoothDeviceDetailsFragment.java | 3 +- ...uetoothDeviceNamePreferenceController.java | 7 +-- .../bluetooth/BluetoothDevicePreference.java | 9 ++-- ...toothDeviceRenamePreferenceController.java | 3 +- .../bluetooth/BluetoothDeviceUpdater.java | 2 +- .../BluetoothDiscoverableEnabler.java | 3 +- .../BluetoothFilesPreferenceController.java | 3 +- .../BluetoothNameDialogFragment.java | 1 - .../bluetooth/BluetoothPairingController.java | 2 + .../bluetooth/BluetoothPairingDetail.java | 3 +- .../bluetooth/BluetoothPairingDialog.java | 1 + .../BluetoothPairingPreferenceController.java | 1 + .../bluetooth/BluetoothPairingRequest.java | 1 - .../bluetooth/BluetoothPairingService.java | 4 +- .../BluetoothPermissionActivity.java | 3 +- .../bluetooth/BluetoothSliceBuilder.java | 8 +-- .../bluetooth/BluetoothSummaryUpdater.java | 4 +- .../ConnectedBluetoothDeviceUpdater.java | 3 +- .../DeviceListPreferenceFragment.java | 5 +- .../bluetooth/DevicePickerFragment.java | 3 +- .../bluetooth/DeviceProfilesSettings.java | 3 +- .../bluetooth/LocalBluetoothPreferences.java | 1 - .../RequestPermissionHelperActivity.java | 6 --- .../SavedBluetoothDeviceUpdater.java | 4 +- src/com/android/settings/bluetooth/Utils.java | 3 +- .../AddDevicePreferenceController.java | 3 +- .../AdvancedConnectedDeviceController.java | 2 + .../AvailableMediaDeviceGroupController.java | 4 +- .../BluetoothDashboardFragment.java | 3 -- .../ConnectedDeviceDashboardFragment.java | 2 +- .../ConnectedDeviceGroupController.java | 5 +- ...iscoverableFooterPreferenceController.java | 7 +-- ...ouslyConnectedDeviceDashboardFragment.java | 1 + ...lyConnectedDevicePreferenceController.java | 4 +- .../SavedDeviceGroupController.java | 3 +- .../connecteddevice/dock/DockUpdater.java | 2 - .../dock/DockUpdaterFeatureProviderImpl.java | 1 - .../usb/ConnectedUsbDeviceUpdater.java | 1 + .../connecteddevice/usb/UsbBackend.java | 1 + .../usb/UsbConnectionBroadcastReceiver.java | 2 +- .../usb/UsbDetailsController.java | 1 + .../usb/UsbDetailsDataRoleController.java | 1 + .../usb/UsbDetailsFragment.java | 1 + .../usb/UsbDetailsFunctionsController.java | 1 + .../usb/UsbDetailsHeaderController.java | 1 + .../usb/UsbDetailsPowerRoleController.java | 3 +- .../core/BasePreferenceController.java | 7 ++- .../core/InstrumentedPreferenceFragment.java | 5 +- .../core/PreferenceXmlParserUtils.java | 5 +- .../core/SliderPreferenceController.java | 1 + .../settings/core/SubSettingLauncher.java | 3 +- .../core/TogglePreferenceController.java | 1 + .../core/gateway/SettingsGateway.java | 4 +- .../settings/dashboard/DashboardAdapter.java | 9 ++-- .../settings/dashboard/DashboardData.java | 3 +- .../dashboard/DashboardFeatureProvider.java | 1 + .../DashboardFeatureProviderImpl.java | 5 +- .../settings/dashboard/DashboardFragment.java | 9 ++-- .../dashboard/DashboardItemAnimator.java | 1 + .../settings/dashboard/DashboardSummary.java | 7 +-- ...rdTilePlaceholderPreferenceController.java | 1 + .../RestrictedDashboardFragment.java | 2 +- .../dashboard/RoundedHomepageIcon.java | 1 + .../settings/dashboard/SummaryLoader.java | 3 +- .../conditional/BatterySaverCondition.java | 1 - .../dashboard/conditional/Condition.java | 1 + .../conditional/ConditionAdapter.java | 7 +-- .../dashboard/conditional/DndCondition.java | 1 + .../conditional/FocusRecyclerView.java | 3 +- .../suggestions/SuggestionAdapter.java | 6 +-- .../SuggestionFeatureProvider.java | 3 +- .../SuggestionFeatureProviderImpl.java | 3 +- .../suggestions/SuggestionStateProvider.java | 3 +- .../settings/datausage/AppDataUsage.java | 7 +-- .../datausage/AppDataUsagePreference.java | 3 +- .../settings/datausage/AppPrefLoader.java | 4 +- .../datausage/BillingCyclePreference.java | 4 +- .../datausage/BillingCycleSettings.java | 5 +- .../datausage/CellDataPreference.java | 7 +-- .../datausage/ChartDataUsagePreference.java | 7 +-- .../datausage/DataSaverPreference.java | 4 +- .../settings/datausage/DataSaverSummary.java | 3 +- .../settings/datausage/DataUsageBase.java | 1 + .../datausage/DataUsageBaseFragment.java | 1 - .../datausage/DataUsageEditController.java | 1 + .../datausage/DataUsageInfoController.java | 1 + .../settings/datausage/DataUsageList.java | 7 +-- .../datausage/DataUsagePreference.java | 5 +- .../settings/datausage/DataUsageSummary.java | 7 +-- .../datausage/DataUsageSummaryLegacy.java | 7 +-- .../datausage/DataUsageSummaryPreference.java | 5 +- .../DataUsageSummaryPreferenceController.java | 7 +-- .../NetworkRestrictionsPreference.java | 3 +- .../settings/datausage/SpinnerPreference.java | 6 ++- .../datausage/TemplatePreference.java | 2 +- .../datausage/TemplatePreferenceCategory.java | 3 +- .../datausage/UnrestrictedDataAccess.java | 5 +- .../AutoTimeFormatPreferenceController.java | 9 ++-- .../AutoTimePreferenceController.java | 1 + .../AutoTimeZonePreferenceController.java | 3 +- .../datetime/DatePreferenceController.java | 5 +- .../TimeFormatPreferenceController.java | 7 +-- .../datetime/TimePreferenceController.java | 3 +- .../TimeZonePreferenceController.java | 3 +- .../android/settings/datetime/ZonePicker.java | 3 +- .../timezone/BaseTimeZoneAdapter.java | 11 ++-- .../timezone/BaseTimeZoneInfoPicker.java | 1 + .../datetime/timezone/BaseTimeZonePicker.java | 7 ++- .../BaseTimeZonePreferenceController.java | 1 + .../timezone/RegionPreferenceController.java | 1 - .../datetime/timezone/RegionSearchPicker.java | 3 +- .../datetime/timezone/RegionZonePicker.java | 3 +- .../RegionZonePreferenceController.java | 1 + .../TimeZoneInfoPreferenceController.java | 1 + .../datetime/timezone/TimeZoneSettings.java | 5 +- .../ActivationWarningFragment.java | 2 +- ...anagerDescriptionPreferenceController.java | 5 +- .../AutomaticStorageManagerSettings.java | 7 +-- ...aticStorageManagerSwitchBarController.java | 5 +- ...ractBluetoothA2dpPreferenceController.java | 1 + .../development/AdbPreferenceController.java | 1 + ...lowAppsOnExternalPreferenceController.java | 3 +- ...atorDurationScalePreferenceController.java | 3 +- ...AppsNotRespondingPreferenceController.java | 3 +- ...roundProcessLimitPreferenceController.java | 1 + ...oothA2dpHwOffloadPreferenceController.java | 4 +- .../BluetoothA2dpHwOffloadRebootDialog.java | 1 - ...othAbsoluteVolumePreferenceController.java | 3 +- ...toothAvrcpVersionPreferenceController.java | 3 +- ...toothDeviceNoNamePreferenceController.java | 3 +- ...ectedAudioDevicesPreferenceController.java | 1 + ...BluetoothSnoopLogPreferenceController.java | 3 +- .../BugReportInPowerPreferenceController.java | 3 +- ...CameraLaserSensorPreferenceController.java | 5 +- .../ClearAdbKeysPreferenceController.java | 5 +- .../development/ColorModePreference.java | 3 +- ...lColorTemperaturePreferenceController.java | 5 +- .../DarkUIPreferenceController.java | 1 + .../DebugGpuOverdrawPreferenceController.java | 5 +- ...ectClipOperationsPreferenceController.java | 5 +- ...bugViewAttributesPreferenceController.java | 3 +- .../DevelopmentSettingsDashboardFragment.java | 5 +- ...eAutomaticUpdatesPreferenceController.java | 3 +- ...wMeasFullTrackingPreferenceController.java | 4 +- ...bleGpuDebugLayersPreferenceController.java | 3 +- .../FileEncryptionPreferenceController.java | 3 +- ...ForceGpuRenderingPreferenceController.java | 3 +- .../ForceMSAAPreferenceController.java | 3 +- .../FreeformWindowsPreferenceController.java | 5 +- ...obalSettingSwitchPreferenceController.java | 3 +- .../GpuViewUpdatesPreferenceController.java | 5 +- ...wareLayersUpdatesPreferenceController.java | 5 +- .../HardwareOverlaysPreferenceController.java | 3 +- .../HdcpCheckingPreferenceController.java | 3 +- .../KeepActivitiesPreferenceController.java | 3 +- ...calBackupPasswordPreferenceController.java | 1 + .../LocalTerminalPreferenceController.java | 3 +- .../LogPersistPreferenceController.java | 1 + .../LogdSizePreferenceController.java | 1 + .../MemoryUsagePreferenceController.java | 3 +- ...obileDataAlwaysOnPreferenceController.java | 3 +- .../MockLocationAppPreferenceController.java | 3 +- ...onChannelWarningsPreferenceController.java | 3 +- .../OemUnlockPreferenceController.java | 3 +- .../PictureColorModePreferenceController.java | 1 + .../PointerLocationPreferenceController.java | 3 +- ...ofileGpuRenderingPreferenceController.java | 5 +- ...ResizableActivityPreferenceController.java | 3 +- .../RtlLayoutPreferenceController.java | 3 +- .../SecondaryDisplayPreferenceController.java | 3 +- ...cureSettingSwitchPreferenceController.java | 3 +- .../SelectDebugAppPreferenceController.java | 1 + ...ManagerThrottlingPreferenceController.java | 3 +- ...wFirstCrashDialogPreferenceController.java | 3 +- .../ShowLayoutBoundsPreferenceController.java | 5 +- ...howSurfaceUpdatesPreferenceController.java | 3 +- .../ShowTapsPreferenceController.java | 3 +- ...imulateColorSpacePreferenceController.java | 3 +- .../StayAwakePreferenceController.java | 1 + .../StrictModePreferenceController.java | 5 +- ...stemSettingSwitchPreferenceController.java | 3 +- ...ringHardwareAccelPreferenceController.java | 3 +- ...ionAnimationScalePreferenceController.java | 3 +- .../UsbAudioRoutingPreferenceController.java | 3 +- ...VerifyAppsOverUsbPreferenceController.java | 1 + .../WaitForDebuggerPreferenceController.java | 5 +- .../WebViewAppPreferenceController.java | 5 +- ...dMacRandomizationPreferenceController.java | 3 +- ...playCertificationPreferenceController.java | 3 +- ...ifiVerboseLoggingPreferenceController.java | 3 +- ...dowAnimationScalePreferenceController.java | 3 +- .../featureflags/FeatureFlagPreference.java | 3 +- .../FeatureFlagsPreferenceController.java | 3 +- .../DevelopmentTilePreferenceController.java | 5 +- .../development/qstile/DevelopmentTiles.java | 3 +- .../BrandedAccountPreferenceController.java | 1 + .../BuildNumberPreferenceController.java | 5 +- .../deviceinfo/DeviceInfoSettings.java | 3 +- .../DeviceModelPreferenceController.java | 3 +- .../DeviceNamePreferenceController.java | 6 +-- .../FccEquipmentIdPreferenceController.java | 3 +- .../FeedbackPreferenceController.java | 3 +- .../HardwareInfoDialogFragment.java | 3 +- .../IpAddressPreferenceController.java | 3 +- .../KernelVersionPreferenceController.java | 1 + .../PhoneNumberPreferenceController.java | 7 +-- .../deviceinfo/PrivateVolumeForget.java | 1 - .../PrivateVolumeOptionMenuController.java | 1 - .../deviceinfo/PrivateVolumeSettings.java | 9 ++-- .../deviceinfo/PublicVolumeSettings.java | 5 +- .../deviceinfo/StorageDashboardFragment.java | 3 +- .../deviceinfo/StorageItemPreference.java | 6 +-- .../deviceinfo/StorageProfileFragment.java | 3 +- .../settings/deviceinfo/StorageSettings.java | 9 ++-- .../deviceinfo/StorageSummaryPreference.java | 5 +- .../deviceinfo/StorageUnmountReceiver.java | 4 +- .../deviceinfo/StorageVolumePreference.java | 7 +-- .../deviceinfo/StorageWizardMoveProgress.java | 10 ++-- .../WifiMacAddressPreferenceController.java | 2 +- .../BasebandVersionDialogController.java | 1 + .../BuildNumberDialogController.java | 3 +- .../FirmwareVersionDialogController.java | 3 +- .../FirmwareVersionPreferenceController.java | 3 +- .../SecurityPatchLevelDialogController.java | 3 +- .../imei/ImeiInfoDialogController.java | 5 +- .../imei/ImeiInfoDialogFragment.java | 5 +- .../imei/ImeiInfoPreferenceController.java | 3 +- .../simstatus/SimStatusDialogController.java | 5 +- .../SimStatusPreferenceController.java | 7 +-- ...eManagementSwitchPreferenceController.java | 1 + .../storage/CachedStorageValuesHelper.java | 3 +- .../storage/SecondaryUserController.java | 3 +- .../StorageItemPreferenceController.java | 5 +- .../StorageSummaryDonutPreference.java | 14 ++--- ...orageSummaryDonutPreferenceController.java | 5 +- .../deviceinfo/storage/UserIconLoader.java | 1 - .../storage/UserProfileController.java | 3 +- .../deviceinfo/storage/VolumeSizesLoader.java | 1 + ...playNotificationsPreferenceController.java | 3 +- .../AmbientDisplayPreferenceController.java | 1 + .../display/AmbientDisplaySettings.java | 5 -- .../android/settings/display/AppGridView.java | 3 +- .../AutoBrightnessPreferenceController.java | 10 ++-- .../AutoRotatePreferenceController.java | 3 +- ...BatteryPercentagePreferenceController.java | 5 +- .../BrightnessLevelPreferenceController.java | 3 +- .../CameraGesturePreferenceController.java | 7 +-- .../display/ColorModePreferenceFragment.java | 4 +- .../display/ConversationMessageView.java | 1 + .../settings/display/DensityPreference.java | 2 +- .../LiftToWakePreferenceController.java | 7 +-- ...DisplayActivationPreferenceController.java | 6 ++- ...htDisplayAutoModePreferenceController.java | 2 + ...playCustomEndTimePreferenceController.java | 2 + ...ayCustomStartTimePreferenceController.java | 2 + ...ightDisplayFooterPreferenceController.java | 2 + ...tDisplayIntensityPreferenceController.java | 3 +- .../display/NightDisplayPreference.java | 3 +- .../NightDisplayPreferenceController.java | 2 +- .../display/NightDisplaySettings.java | 1 + .../NightModePreferenceController.java | 3 +- .../ScreenSaverPreferenceController.java | 1 + .../display/ScreenZoomPreference.java | 5 +- .../ShowOperatorNamePreferenceController.java | 3 +- .../SystemUiThemePreferenceController.java | 5 +- .../TapToWakePreferenceController.java | 3 +- .../display/ThemePreferenceController.java | 3 +- .../display/TimeoutPreferenceController.java | 3 +- .../VrDisplayPreferenceController.java | 1 + .../WallpaperPreferenceController.java | 7 +-- .../settings/dream/CurrentDreamPicker.java | 2 + .../CurrentDreamPreferenceController.java | 3 ++ .../android/settings/dream/DreamSettings.java | 1 + .../dream/StartNowPreferenceController.java | 4 +- .../settings/dream/WhenToDreamPicker.java | 2 + .../WhenToDreamPreferenceController.java | 2 + .../ActionDisabledByAdminDialogHelper.java | 3 +- .../AdminActionPreferenceControllerBase.java | 3 +- ...edPermissionsPreferenceControllerBase.java | 1 + ...sOnVpnCurrentUserPreferenceController.java | 1 + .../ApplicationListPreferenceController.java | 3 +- ...aCertsCurrentUserPreferenceController.java | 1 + ...rtsManagedProfilePreferenceController.java | 1 + .../CaCertsPreferenceControllerBase.java | 1 + ...InstalledPackagesPreferenceController.java | 1 + ...EnterprisePrivacyPreferenceController.java | 1 + ...etDefaultAppsListPreferenceController.java | 1 + ...iseSetDefaultAppsPreferenceController.java | 1 + ...dPasswordWipePreferenceControllerBase.java | 1 + .../enterprise/ImePreferenceController.java | 1 + ...ManageDeviceAdminPreferenceController.java | 1 + .../FingerprintEnrollEnrolling.java | 2 - .../FingerprintEnrollFindSensor.java | 3 +- ...FingerprintLocationAnimationVideoView.java | 3 +- .../fingerprint/FingerprintRemoveSidecar.java | 11 ++-- .../fingerprint/FingerprintSettings.java | 13 ++--- ...FingerprintStatusPreferenceController.java | 1 + .../SetupFingerprintEnrollFindSensor.java | 1 + .../fuelgauge/AdvancedPowerUsageDetail.java | 5 +- .../AppButtonsPreferenceController.java | 5 +- .../AutoRestrictionPreferenceController.java | 3 +- ...ackgroundActivityPreferenceController.java | 1 + .../BatteryAppListPreferenceController.java | 11 ++-- .../fuelgauge/BatteryBroadcastReceiver.java | 2 +- .../settings/fuelgauge/BatteryCellParser.java | 1 + .../settings/fuelgauge/BatteryFlagParser.java | 1 + .../BatteryHeaderPreferenceController.java | 3 +- .../fuelgauge/BatteryHistoryDetail.java | 1 + .../fuelgauge/BatteryHistoryPreference.java | 8 +-- .../settings/fuelgauge/BatteryInfo.java | 3 +- .../settings/fuelgauge/BatteryInfoLoader.java | 3 +- .../settings/fuelgauge/BatteryMeterView.java | 3 +- ...tteryOptimizationPreferenceController.java | 1 + .../fuelgauge/BatterySaverController.java | 1 + .../fuelgauge/BatteryStatsHelperLoader.java | 3 +- .../settings/fuelgauge/BatteryUtils.java | 11 ++-- .../fuelgauge/ButtonActionDialogFragment.java | 2 +- .../fuelgauge/DebugEstimatesLoader.java | 4 +- .../settings/fuelgauge/InactiveApps.java | 3 +- .../fuelgauge/PowerGaugePreference.java | 3 +- .../fuelgauge/PowerUsageAdvanced.java | 3 +- .../fuelgauge/PowerUsageAnomalyDetails.java | 3 +- .../settings/fuelgauge/PowerUsageBase.java | 5 +- .../settings/fuelgauge/PowerUsageSummary.java | 3 +- .../RestrictAppPreferenceController.java | 3 +- .../fuelgauge/RestrictedAppDetails.java | 3 +- .../SmartBatteryPreferenceController.java | 5 +- .../settings/fuelgauge/anomaly/Anomaly.java | 3 +- .../anomaly/AnomalyDetectionPolicy.java | 3 +- .../anomaly/AnomalyDialogFragment.java | 1 + .../fuelgauge/anomaly/AnomalyLoader.java | 6 +-- .../fuelgauge/anomaly/AnomalyPreference.java | 3 +- .../AnomalySummaryPreferenceController.java | 1 + .../fuelgauge/anomaly/AnomalyUtils.java | 3 +- .../anomaly/action/BackgroundCheckAction.java | 1 + .../anomaly/action/LocationCheckAction.java | 1 + .../action/StopAndBackgroundCheckAction.java | 1 + .../checker/BluetoothScanAnomalyDetector.java | 4 +- .../checker/WakeLockAnomalyDetector.java | 1 + .../checker/WakeupAlarmAnomalyDetector.java | 6 +-- .../AutoBatterySaverPreferenceController.java | 1 + ...utoBatterySeekBarPreferenceController.java | 5 +- ...atterySaverButtonPreferenceController.java | 1 + .../batterytip/AnomalyCleanupJobService.java | 3 +- .../batterytip/AnomalyConfigJobService.java | 3 +- .../batterytip/AnomalyConfigReceiver.java | 3 -- .../batterytip/AnomalyDatabaseHelper.java | 3 +- .../AnomalyDetectionJobService.java | 5 +- .../fuelgauge/batterytip/AppInfo.java | 3 +- .../BatteryManagerPreferenceController.java | 1 + .../batterytip/BatteryTipDialogFragment.java | 6 +-- .../batterytip/BatteryTipLoader.java | 3 +- .../batterytip/BatteryTipPolicy.java | 4 +- .../BatteryTipPreferenceController.java | 3 +- .../fuelgauge/batterytip/BatteryTipUtils.java | 1 + .../batterytip/HighUsageAdapter.java | 5 +- .../batterytip/StatsManagerConfig.java | 3 -- .../actions/OpenBatterySaverAction.java | 9 ---- .../batterytip/actions/RestrictAppAction.java | 3 +- .../actions/UnrestrictAppAction.java | 3 +- .../detectors/HighUsageDetector.java | 7 +-- .../detectors/RestrictAppDetector.java | 3 +- .../tips/AppRestrictionPredicate.java | 1 - .../fuelgauge/batterytip/tips/BatteryTip.java | 3 +- .../batterytip/tips/HighUsageTip.java | 2 +- .../batterytip/tips/RestrictAppTip.java | 1 - .../batterytip/tips/SmartBatteryTip.java | 1 - .../fuelgauge/batterytip/tips/SummaryTip.java | 1 + .../AssistGestureFeatureProviderImpl.java | 1 - ...stGestureSettingsPreferenceController.java | 1 + .../DoubleTapPowerPreferenceController.java | 3 +- .../DoubleTapScreenPreferenceController.java | 8 +-- .../gestures/DoubleTapScreenSettings.java | 2 - .../DoubleTwistPreferenceController.java | 3 +- .../gestures/GesturePreferenceController.java | 2 +- .../settings/gestures/GestureSettings.java | 6 --- .../GesturesSettingPreferenceController.java | 1 + .../PickupGesturePreferenceController.java | 3 +- .../PreventRingingGestureSettings.java | 4 -- .../PreventRingingPreferenceController.java | 1 + .../gestures/SwipeUpPreferenceController.java | 1 - .../settings/graph/BottomLabelLayout.java | 3 +- .../android/settings/graph/UsageGraph.java | 3 +- src/com/android/settings/graph/UsageView.java | 1 + .../GameControllerPreferenceController.java | 3 +- .../InputMethodAndSubtypeEnabler.java | 3 +- .../KeyboardLayoutDialogFragment.java | 1 - .../KeyboardLayoutPickerFragment.java | 3 +- .../inputmethod/PhysicalKeyboardFragment.java | 7 +-- .../PhysicalKeyboardPreferenceController.java | 1 + .../inputmethod/SpellCheckerPreference.java | 3 +- .../SpellCheckerPreferenceController.java | 5 +- .../inputmethod/SpellCheckersSettings.java | 9 ++-- .../UserDictionaryCursorLoader.java | 3 +- .../inputmethod/UserDictionaryList.java | 7 +-- .../inputmethod/VirtualKeyboardFragment.java | 3 +- .../VirtualKeyboardPreferenceController.java | 3 +- .../language/LanguageAndInputSettings.java | 5 +- .../PhoneLanguagePreferenceController.java | 1 + .../language/PointerSpeedController.java | 6 +-- .../language/TtsPreferenceController.java | 2 +- .../UserDictionaryPreferenceController.java | 1 + .../LocaleDragAndDropAdapter.java | 10 ++-- .../LocaleLinearLayoutManager.java | 3 +- .../localepicker/LocaleListEditor.java | 9 ++-- .../localepicker/LocaleRecyclerView.java | 3 +- ...BluetoothScanningPreferenceController.java | 3 +- .../settings/location/LocationEnabler.java | 12 ++--- .../LocationFooterPreferenceController.java | 5 +- .../LocationForWorkPreferenceController.java | 1 + .../LocationPreferenceController.java | 4 +- .../LocationScanningPreferenceController.java | 6 +-- .../LocationServicePreferenceController.java | 3 +- .../settings/location/LocationSettings.java | 3 ++ .../location/LocationSliceBuilder.java | 11 ++-- .../location/LocationSwitchBarController.java | 1 + ...ntLocationRequestPreferenceController.java | 3 ++ .../RecentLocationRequestSeeAllFragment.java | 2 + ...tionRequestSeeAllPreferenceController.java | 3 ++ .../settings/location/SettingsInjector.java | 3 +- .../WifiScanningPreferenceController.java | 3 +- .../AirplaneModePreferenceController.java | 6 +-- .../android/settings/network/ApnEditor.java | 15 +++--- .../settings/network/ApnPreference.java | 5 +- .../android/settings/network/ApnSettings.java | 5 +- .../MobileNetworkPreferenceController.java | 7 +-- .../MobilePlanPreferenceController.java | 3 +- .../network/NetworkDashboardFragment.java | 3 +- .../NetworkResetRestrictionChecker.java | 1 + .../settings/network/NetworkScorerPicker.java | 7 +-- ...tworkScorerPickerPreferenceController.java | 1 + .../PrivateDnsModeDialogPreference.java | 4 +- .../PrivateDnsPreferenceController.java | 5 +- .../network/ProxyPreferenceController.java | 1 + .../network/TetherPreferenceController.java | 2 + .../network/VpnPreferenceController.java | 5 +- src/com/android/settings/nfc/AndroidBeam.java | 10 ++-- .../nfc/AndroidBeamPreferenceController.java | 3 +- .../android/settings/nfc/BaseNfcEnabler.java | 1 - .../settings/nfc/NfcAirplaneModeObserver.java | 1 + src/com/android/settings/nfc/NfcEnabler.java | 1 + .../settings/nfc/NfcForegroundPreference.java | 1 + .../settings/nfc/NfcPaymentPreference.java | 5 +- .../settings/nfc/NfcPreferenceController.java | 2 - .../android/settings/nfc/PaymentSettings.java | 4 +- ...ModeAutomaticRulePreferenceController.java | 1 + .../AbstractZenModePreferenceController.java | 1 + ...tVolumeRestrictedPreferenceController.java | 2 +- .../AllowSoundPreferenceController.java | 3 +- .../AppLinkPreferenceController.java | 1 + .../notification/AppNotificationSettings.java | 7 +-- .../settings/notification/AudioHelper.java | 1 + .../BadgePreferenceController.java | 2 +- ...dgingNotificationPreferenceController.java | 11 ++-- .../BlockPreferenceController.java | 4 +- .../BootSoundPreferenceController.java | 4 +- .../ChannelGroupNotificationSettings.java | 3 +- .../ChannelNotificationSettings.java | 4 +- .../ChargingSoundPreferenceController.java | 2 +- .../ConfigureNotificationSettings.java | 3 +- .../DefaultNotificationTonePreference.java | 14 +---- .../DeletedChannelsPreferenceController.java | 1 + .../DescriptionPreferenceController.java | 3 +- .../DialPadTonePreferenceController.java | 2 +- .../notification/DndPreferenceController.java | 5 +- .../DockAudioMediaPreferenceController.java | 3 +- .../DockingSoundPreferenceController.java | 1 + ...mergencyBroadcastPreferenceController.java | 1 + .../EmergencyTonePreferenceController.java | 2 +- .../notification/EmptyTextSettings.java | 2 +- .../HeaderPreferenceController.java | 10 ++-- .../ImportancePreferenceController.java | 1 + .../LightsPreferenceController.java | 5 +- ...creenNotificationPreferenceController.java | 5 +- .../NotificationAppPreference.java | 3 +- .../NotificationFooterPreference.java | 7 +-- .../NotificationLockscreenPreference.java | 11 ++-- .../NotificationPreferenceController.java | 4 +- .../NotificationSettingsBase.java | 9 ++-- .../notification/NotificationStation.java | 8 +-- .../NotificationSwitchBarPreference.java | 3 +- .../NotificationsOffPreferenceController.java | 1 + .../PhoneRingtonePreferenceController.java | 1 + ...PulseNotificationPreferenceController.java | 7 +-- ...centNotifyingAppsPreferenceController.java | 9 ++-- .../RingVolumePreferenceController.java | 3 +- .../RingtonePreferenceControllerBase.java | 1 + .../ScreenLockSoundPreferenceController.java | 2 +- .../settings/notification/SettingPref.java | 1 + .../notification/SettingPrefController.java | 2 +- .../SoundPreferenceController.java | 1 + .../settings/notification/SoundSettings.java | 3 +- .../notification/SuppressorHelper.java | 3 +- .../TouchSoundPreferenceController.java | 2 +- .../VibrateOnTouchPreferenceController.java | 1 + .../VibrateWhenRingPreferenceController.java | 3 +- .../VibrationPreferenceController.java | 2 +- .../VisibilityPreferenceController.java | 1 + .../notification/VolumeSeekBarPreference.java | 6 +-- .../VolumeSeekBarPreferenceController.java | 3 +- .../WorkSoundPreferenceController.java | 1 + .../notification/ZenAccessSettings.java | 9 ++-- ...tomaticRuleHeaderPreferenceController.java | 5 +- ...tomaticRuleSwitchPreferenceController.java | 3 +- .../ZenCustomRadioButtonPreference.java | 3 +- .../ZenFooterPreferenceController.java | 1 + ...eAddAutomaticRulePreferenceController.java | 3 +- .../ZenModeAlarmsPreferenceController.java | 5 +- ...odeAutomaticRulesPreferenceController.java | 1 + ...ZenModeAutomationPreferenceController.java | 1 + .../settings/notification/ZenModeBackend.java | 3 +- ...ModeBehaviorCallsPreferenceController.java | 1 + ...odeBehaviorFooterPreferenceController.java | 1 + ...rMsgEventReminderPreferenceController.java | 1 + ...ModeBehaviorSoundPreferenceController.java | 1 + ...odeBlockedEffectsPreferenceController.java | 1 - .../ZenModeBlockedEffectsSettings.java | 1 - .../ZenModeButtonPreferenceController.java | 3 +- .../ZenModeCallsPreferenceController.java | 3 +- .../ZenModeDurationPreferenceController.java | 1 + .../ZenModeEventRuleSettings.java | 1 + .../ZenModeEventsPreferenceController.java | 4 +- .../ZenModeMediaPreferenceController.java | 5 +- .../ZenModeMessagesPreferenceController.java | 3 +- .../ZenModePreferenceController.java | 2 +- .../ZenModeRemindersPreferenceController.java | 5 +- ...ModeRepeatCallersPreferenceController.java | 5 +- .../notification/ZenModeRuleSettingsBase.java | 5 +- .../ZenModeScheduleRuleSettings.java | 9 ++-- .../notification/ZenModeSettings.java | 1 + ...odeSettingsFooterPreferenceController.java | 1 + .../notification/ZenModeSliceBuilder.java | 14 ++--- ...deStarredContactsPreferenceController.java | 1 + .../ZenModeSystemPreferenceController.java | 5 +- .../ZenModeVisEffectPreferenceController.java | 3 +- ...ModeVisEffectsAllPreferenceController.java | 1 + ...eVisEffectsCustomPreferenceController.java | 1 + ...odeVisEffectsNonePreferenceController.java | 1 + .../notification/ZenModeVoiceActivity.java | 6 +-- .../notification/ZenRulePreference.java | 3 +- .../settings/overlay/FeatureFactoryImpl.java | 1 + .../overlay/SupportFeatureProvider.java | 5 -- .../overlay/SurveyFeatureProvider.java | 2 +- .../settings/password/ChooseLockGeneric.java | 10 ++-- .../password/ChooseLockGenericController.java | 1 + .../settings/password/ChooseLockPassword.java | 7 +-- .../password/ManagedLockPasswordProvider.java | 2 - .../password/PasswordRequirementAdapter.java | 3 +- .../password/SetNewPasswordController.java | 1 + .../password/SetupChooseLockGeneric.java | 7 +-- .../password/SetupChooseLockPassword.java | 3 +- .../password/SetupChooseLockPattern.java | 3 +- .../settings/password/SetupSkipDialog.java | 1 + .../print/PrintJobSettingsFragment.java | 3 +- .../print/PrintServiceSettingsFragment.java | 2 +- .../PrintSettingPreferenceController.java | 1 + .../settings/print/PrintSettingsFragment.java | 5 +- .../search/BaseSearchIndexProvider.java | 5 +- .../search/DatabaseIndexingManager.java | 4 +- .../search/DeviceIndexUpdateJobService.java | 17 +++--- .../settings/search/IndexDatabaseHelper.java | 3 +- .../settings/search/InlinePayload.java | 4 +- .../search/SearchIndexableResourcesImpl.java | 16 +++--- .../search/indexing/IndexDataConverter.java | 5 +- .../indexing/PreIndexDataCollector.java | 45 ++++++++-------- ...ProfileScreenLockPreferenceController.java | 3 +- .../ChangeScreenLockPreferenceController.java | 3 +- .../security/ConfigureKeyGuardDialog.java | 1 + ...CredentialStoragePreferenceController.java | 1 + .../security/CryptKeeperSettings.java | 3 +- .../EncryptionStatusPreferenceController.java | 3 +- .../LockUnificationPreferenceController.java | 1 + .../LockdownButtonPreferenceController.java | 2 - .../security/LockscreenDashboardFragment.java | 1 + .../OwnerInfoPreferenceController.java | 1 + .../ResetCredentialsPreferenceController.java | 1 + .../security/ScreenPinningSettings.java | 9 ++-- .../ShowPasswordPreferenceController.java | 2 +- .../security/SimLockPreferenceController.java | 5 +- ...blePatternProfilePreferenceController.java | 3 +- .../LockAfterTimeoutPreferenceController.java | 3 +- .../LockScreenPreferenceController.java | 1 + .../PatternVisiblePreferenceController.java | 1 + ...ButtonInstantLockPreferenceController.java | 3 +- ...ManageTrustAgentsPreferenceController.java | 1 + .../TrustAgentListPreferenceController.java | 3 +- .../trustagent/TrustAgentManager.java | 3 +- .../trustagent/TrustAgentSettings.java | 7 +-- .../settings/shortcut/CreateShortcut.java | 3 +- .../settings/sim/SimSelectNotification.java | 4 +- src/com/android/settings/sim/SimSettings.java | 5 +- .../slices/SettingsSliceProvider.java | 8 +-- .../slices/SliceBroadcastReceiver.java | 2 +- .../settings/slices/SliceBuilderUtils.java | 17 ++---- .../android/settings/slices/SliceData.java | 1 - .../slices/SliceDeepLinkSpringBoard.java | 2 - .../slices/SlicesDatabaseAccessor.java | 7 ++- .../settings/slices/SlicesDatabaseHelper.java | 4 +- .../settings/slices/SlicesIndexer.java | 4 +- .../AudioSwitchPreferenceController.java | 7 +-- ...FreeProfileOutputPreferenceController.java | 4 +- .../MediaOutputPreferenceController.java | 4 +- .../NewDeviceIntroSuggestionActivity.java | 5 +- .../android/settings/survey/SurveyMixin.java | 1 + .../system/SystemDashboardFragment.java | 1 + .../SystemUpdatePreferenceController.java | 5 +- .../settings/tts/TextToSpeechSettings.java | 5 +- .../settings/tts/TtsEnginePreference.java | 5 +- .../tts/TtsEnginePreferenceFragment.java | 31 ++++++----- ...AddUserWhenLockedPreferenceController.java | 1 + .../users/AppRestrictionsFragment.java | 17 +++--- .../AutoSyncDataPreferenceController.java | 5 +- .../users/EditUserPhotoController.java | 3 +- .../settings/users/RestrictionUtils.java | 1 - .../settings/users/UserCapabilities.java | 1 + .../settings/users/UserDetailsSettings.java | 3 +- .../settings/users/UserPreference.java | 3 +- .../android/settings/users/UserSettings.java | 13 ++--- .../utils/ManagedServiceSettings.java | 5 +- .../utils/SettingsDividerItemDecoration.java | 1 + .../settings/utils/ZenServiceListing.java | 4 -- .../settings/vpn2/AppManagementFragment.java | 3 +- .../android/settings/vpn2/AppPreference.java | 1 + .../settings/vpn2/ConfigDialogFragment.java | 2 - .../vpn2/ConfirmLockdownFragment.java | 3 +- .../settings/vpn2/LegacyVpnPreference.java | 3 +- .../settings/vpn2/ManageablePreference.java | 2 +- .../android/settings/vpn2/VpnSettings.java | 9 ++-- .../WallpaperSuggestionActivity.java | 1 + .../wallpaper/WallpaperTypeSettings.java | 1 + .../settings/webview/WebViewAppPicker.java | 3 +- .../settings/wfd/WifiDisplaySettings.java | 17 +++--- .../widget/ActionBarShadowController.java | 3 +- .../widget/ActionButtonPreference.java | 7 +-- .../widget/AppCheckBoxPreference.java | 3 +- .../settings/widget/AppPreference.java | 5 +- .../settings/widget/AppSwitchPreference.java | 5 +- .../widget/AspectRatioFrameLayout.java | 3 +- .../settings/widget/ChartDataUsageView.java | 4 +- .../settings/widget/ChartGridView.java | 4 +- .../widget/ChartNetworkSeriesView.java | 6 +-- .../widget/DisabledCheckBoxPreference.java | 5 +- .../android/settings/widget/DonutView.java | 3 +- .../settings/widget/DotsPageIndicator.java | 4 +- .../widget/EntityHeaderController.java | 7 +-- .../widget/FixedLineSummaryPreference.java | 6 ++- .../settings/widget/GearPreference.java | 3 +- .../HighlightablePreferenceGroupAdapter.java | 9 ++-- .../HotspotApBandSelectionPreference.java | 4 +- .../settings/widget/LabeledSeekBar.java | 8 +-- .../widget/MasterCheckBoxPreference.java | 3 +- .../widget/MasterSwitchController.java | 2 +- .../widget/MasterSwitchPreference.java | 3 +- .../widget/RadioButtonPickerFragment.java | 9 ++-- .../widget/RadioButtonPreference.java | 7 +-- .../widget/RestrictedAppPreference.java | 5 +- .../widget/RtlCompatibleViewPager.java | 5 +- .../widget/ScrollToParentEditText.java | 3 -- .../settings/widget/SeekBarPreference.java | 6 +-- .../widget/SettingsAppWidgetProvider.java | 5 -- .../settings/widget/SlidingTabLayout.java | 3 +- .../android/settings/widget/SwitchBar.java | 7 +-- .../settings/widget/SwitchBarController.java | 1 + .../widget/TwoStateButtonPreference.java | 5 +- ...UpdatableListPreferenceDialogFragment.java | 6 ++- .../widget/ValidatedEditTextPreference.java | 6 +-- .../settings/widget/VideoPreference.java | 7 +-- .../settings/widget/WorkOnlyCategory.java | 3 +- .../wifi/AppStateChangeWifiStateBridge.java | 1 - .../CellularFallbackPreferenceController.java | 5 +- .../settings/wifi/ChangeWifiStateDetails.java | 12 ++--- .../wifi/ConnectedAccessPointPreference.java | 3 +- .../settings/wifi/LinkablePreference.java | 8 +-- .../wifi/LongPressAccessPointPreference.java | 4 +- ...otifyOpenNetworksPreferenceController.java | 5 +- .../wifi/RequestToggleWiFiActivity.java | 4 +- .../wifi/SavedAccessPointsWifiSettings.java | 5 +- .../wifi/UseOpenWifiPreferenceController.java | 6 +-- .../android/settings/wifi/WifiAPITest.java | 5 +- .../settings/wifi/WifiConfigController.java | 4 +- .../settings/wifi/WifiDetailPreference.java | 5 +- .../settings/wifi/WifiDialogActivity.java | 3 +- .../android/settings/wifi/WifiEnabler.java | 3 +- .../wifi/WifiInfoPreferenceController.java | 3 +- .../WifiMasterSwitchPreferenceController.java | 7 +-- .../settings/wifi/WifiNoInternetDialog.java | 8 +-- .../settings/wifi/WifiPickerActivity.java | 1 + .../wifi/WifiScanningRequiredFragment.java | 3 +- .../android/settings/wifi/WifiSettings.java | 7 +-- .../settings/wifi/WifiSliceBuilder.java | 16 +++--- .../settings/wifi/WifiSummaryUpdater.java | 3 +- src/com/android/settings/wifi/WifiUtils.java | 1 + .../wifi/WifiWakeupPreferenceController.java | 5 +- .../wifi/calling/WifiCallingSettings.java | 3 +- .../calling/WifiCallingSettingsForSub.java | 9 ++-- .../wifi/calling/WifiCallingSliceHelper.java | 2 +- .../WifiDetailPreferenceController.java | 9 ++-- .../WifiMeteredPreferenceController.java | 6 +-- .../p2p/P2pCategoryPreferenceController.java | 1 + .../P2pThisDevicePreferenceController.java | 3 +- .../settings/wifi/p2p/WifiP2pPeer.java | 6 ++- .../wifi/p2p/WifiP2pPersistentGroup.java | 2 +- .../wifi/p2p/WifiP2pPreferenceController.java | 1 + .../settings/wifi/p2p/WifiP2pSettings.java | 5 +- .../WifiTetherApBandPreferenceController.java | 3 +- ...WifiTetherAutoOffPreferenceController.java | 3 +- .../WifiTetherBasePreferenceController.java | 1 + ...ifiTetherPasswordPreferenceController.java | 3 +- .../WifiTetherPreferenceController.java | 3 +- .../WifiTetherSSIDPreferenceController.java | 4 +- ...ifiTetherSecurityPreferenceController.java | 2 +- .../wifi/tether/WifiTetherSettings.java | 3 +- .../tether/WifiTetherSwitchBarController.java | 1 + .../android/settings/HelpTrampolineTest.java | 1 + .../android/settings/LegalSettingsTest.java | 1 + .../com/android/settings/MasterClearTest.java | 1 + .../android/settings/PrivacySettingsTest.java | 2 +- .../settings/ResetNetworkConfirmTest.java | 1 + .../RestrictedListPreferenceTest.java | 3 ++ .../RestrictedSettingsFragmentTest.java | 2 - .../settings/SettingsDumpServiceTest.java | 1 + .../settings/SettingsInitializeTest.java | 8 +-- .../settings/SettingsLicenseActivityTest.java | 1 + .../SettingsPreferenceFragmentTest.java | 4 +- .../settings/SetupWizardUtilsTest.java | 1 + .../settings/SummaryPreferenceTest.java | 5 +- .../src/com/android/settings/UtilsTest.java | 1 + .../AccessibilitySettingsTest.java | 4 +- ...sibilitySlicePreferenceControllerTest.java | 7 ++- ...backIntensityPreferenceControllerTest.java | 3 +- ...ationGesturesPreferenceControllerTest.java | 1 + ...icationNavbarPreferenceControllerTest.java | 1 + ...tionIntensityPreferenceControllerTest.java | 5 +- .../ShortcutServicePickerFragmentTest.java | 1 + .../ToggleFeaturePreferenceFragmentTest.java | 3 +- .../VibrationPreferenceFragmentTest.java | 7 +-- .../AccountDashboardFragmentTest.java | 8 ++- .../AccountDetailDashboardFragmentTest.java | 2 + ...AccountHeaderPreferenceControllerTest.java | 7 ++- .../AccountPreferenceControllerTest.java | 4 +- .../AccountSyncPreferenceControllerTest.java | 3 +- .../AccountTypePreferenceLoaderTest.java | 3 +- ...EmergencyInfoPreferenceControllerTest.java | 2 + .../accounts/ProviderPreferenceTest.java | 1 + ...RemoveAccountPreferenceControllerTest.java | 3 +- ...pAndNotificationDashboardFragmentTest.java | 1 + .../applications/AppInfoWithHeaderTest.java | 2 + ...ppPermissionsPreferenceControllerTest.java | 2 + .../AppStorageSizesControllerTest.java | 2 + ...ithAdminGrantedPermissionsCounterTest.java | 2 + ...WithAdminGrantedPermissionsListerTest.java | 2 + .../ApplicationFeatureProviderImplTest.java | 1 + .../applications/DataSaverControllerTest.java | 1 + .../applications/DefaultAppSettingsTest.java | 1 + .../DeviceAdministratorsControllerTest.java | 1 + .../EnabledVrListenersControllerTest.java | 1 + .../FetchPackageStorageAsyncLoaderTest.java | 1 + .../HighPowerAppsControllerTest.java | 1 + .../applications/InstalledAppCounterTest.java | 2 + .../applications/InstalledAppListerTest.java | 2 + .../applications/LayoutPreferenceTest.java | 4 +- .../PremiumSmsControllerTest.java | 1 + .../RecentAppsPreferenceControllerTest.java | 4 +- .../SpecialAccessSettingsTest.java | 1 + ...cialAppAccessPreferenceControllerTest.java | 2 + .../applications/UsageAccessDetailsTest.java | 1 + ...pActionButtonPreferenceControllerTest.java | 2 + .../AppBatteryPreferenceControllerTest.java | 2 + .../AppDataUsagePreferenceControllerTest.java | 2 + ...AppHeaderViewPreferenceControllerTest.java | 7 ++- .../appinfo/AppInfoDashboardFragmentTest.java | 2 + .../AppInfoPreferenceControllerBaseTest.java | 3 ++ ...InstallerInfoPreferenceControllerTest.java | 2 + .../AppMemoryPreferenceControllerTest.java | 2 + ...pNotificationPreferenceControllerTest.java | 3 ++ ...OpenByDefaultPreferenceControllerTest.java | 2 + ...AppPermissionPreferenceControllerTest.java | 2 + .../AppSettingPreferenceControllerTest.java | 7 +-- .../AppStoragePreferenceControllerTest.java | 2 + .../AppVersionPreferenceControllerTest.java | 1 + ...pShortcutPreferenceControllerBaseTest.java | 1 + ...owserShortcutPreferenceControllerTest.java | 1 + ...gencyShortcutPreferenceControllerTest.java | 1 + ...tHomeShortcutPreferenceControllerTest.java | 1 + ...PhoneShortcutPreferenceControllerTest.java | 1 + ...ltSmsShortcutPreferenceControllerTest.java | 1 + ...OverlayDetailPreferenceControllerTest.java | 3 ++ .../appinfo/DrawOverlayDetailsTest.java | 1 + ...lSourceDetailPreferenceControllerTest.java | 2 + .../appinfo/ExternalSourcesDetailsTest.java | 1 + ...antAppButtonsPreferenceControllerTest.java | 6 ++- ...antAppDomainsPreferenceControllerTest.java | 1 + ...PictureDetailPreferenceControllerTest.java | 2 + .../appinfo/PictureInPictureDetailsTest.java | 1 + .../appinfo/PictureInPictureSettingsTest.java | 1 + ...imeSpentInAppPreferenceControllerTest.java | 3 ++ ...ystemSettingsPreferenceControllerTest.java | 3 ++ ...AssistContextPreferenceControllerTest.java | 5 +- ...stFlashScreenPreferenceControllerTest.java | 5 +- .../assist/DefaultAssistPickerTest.java | 1 + ...DefaultAssistPreferenceControllerTest.java | 1 + .../DefaultAppPickerFragmentTest.java | 3 +- .../DefaultAppPreferenceControllerTest.java | 2 + .../DefaultAutofillPickerTest.java | 1 + ...faultAutofillPreferenceControllerTest.java | 4 +- .../defaultapps/DefaultBrowserPickerTest.java | 6 ++- ...efaultBrowserPreferenceControllerTest.java | 2 + .../DefaultEmergencyPickerTest.java | 1 + .../defaultapps/DefaultHomePickerTest.java | 1 + .../DefaultHomePreferenceControllerTest.java | 6 +-- ...ymentSettingsPreferenceControllerTest.java | 2 + .../manageapplications/AppFilterItemTest.java | 7 ++- .../AppFilterRegistryTest.java | 53 ++++++++++++------- .../ApplicationViewHolderTest.java | 1 + .../ManageApplicationsTest.java | 16 +++--- .../MusicViewHolderControllerTest.java | 1 + .../PhotosViewHolderControllerTest.java | 1 + ...tingsActivityPreferenceControllerTest.java | 2 + .../backup/BackupSettingsActivityTest.java | 1 + .../backup/BackupSettingsHelperTest.java | 1 + ...ackupSettingsPreferenceControllerTest.java | 2 + .../bluetooth/AlwaysDiscoverableTest.java | 1 + ...ilableMediaBluetoothDeviceUpdaterTest.java | 19 ++++--- ...BluetoothDetailsButtonsControllerTest.java | 1 + .../BluetoothDetailsControllerEventsTest.java | 1 + .../BluetoothDetailsControllerTestBase.java | 3 +- .../BluetoothDetailsHeaderControllerTest.java | 2 +- ...luetoothDetailsProfilesControllerTest.java | 4 +- .../BluetoothDeviceDetailsFragmentTest.java | 1 + ...othDeviceNamePreferenceControllerTest.java | 2 + .../BluetoothDevicePreferenceTest.java | 1 + ...hDeviceRenamePreferenceControllerTest.java | 2 + .../bluetooth/BluetoothDeviceUpdaterTest.java | 7 +-- .../bluetooth/BluetoothEnablerTest.java | 5 +- ...luetoothFilesPreferenceControllerTest.java | 3 +- .../bluetooth/BluetoothPairingDetailTest.java | 2 + .../bluetooth/BluetoothPairingDialogTest.java | 1 + ...etoothPairingPreferenceControllerTest.java | 2 + .../bluetooth/BluetoothSliceBuilderTest.java | 21 ++++---- .../BluetoothSummaryUpdaterTest.java | 1 + ...uetoothSwitchPreferenceControllerTest.java | 2 - .../ConnectedBluetoothDeviceUpdaterTest.java | 4 +- .../DeviceListPreferenceFragmentTest.java | 2 + .../bluetooth/DeviceProfilesSettingsTest.java | 3 +- .../ForgetDeviceDialogFragmentTest.java | 1 + .../RemoteDeviceNameDialogFragmentTest.java | 1 + .../SavedBluetoothDeviceUpdaterTest.java | 2 +- .../AddDevicePreferenceControllerTest.java | 5 +- ...AdvancedConnectedDeviceControllerTest.java | 11 ++-- ...dConnectedDeviceDashboardFragmentTest.java | 4 +- ...ailableMediaDeviceGroupControllerTest.java | 2 + .../BluetoothDashboardFragmentTest.java | 1 - .../ConnectedDeviceGroupControllerTest.java | 2 +- ...verableFooterPreferenceControllerTest.java | 8 +-- ...nnectedDevicePreferenceControllerTest.java | 14 +++-- .../SavedDeviceGroupControllerTest.java | 6 ++- .../connecteddevice/usb/UsbBackendTest.java | 1 + .../usb/UsbDefaultFragmentTest.java | 1 + .../usb/UsbDetailsDataRoleControllerTest.java | 1 + .../UsbDetailsFunctionsControllerTest.java | 1 + .../usb/UsbDetailsHeaderControllerTest.java | 4 +- .../UsbDetailsPowerRoleControllerTest.java | 4 +- .../core/BasePreferenceControllerTest.java | 8 +-- .../InstrumentedPreferenceFragmentTest.java | 1 + ...ettingsSliderPreferenceControllerTest.java | 2 +- .../core/SliderPreferenceControllerTest.java | 1 + .../settings/core/SubSettingLauncherTest.java | 1 + .../core/TogglePreferenceControllerTest.java | 1 + .../InstrumentableFragmentCodeInspector.java | 4 +- .../dashboard/DashboardAdapterTest.java | 4 +- .../settings/dashboard/DashboardDataTest.java | 3 ++ .../DashboardFeatureProviderImplTest.java | 2 + .../dashboard/DashboardFragmentTest.java | 2 + .../dashboard/DashboardItemAnimatorTest.java | 3 +- .../dashboard/DashboardSummaryTest.java | 2 + ...lePlaceholderPreferenceControllerTest.java | 2 + .../dashboard/RoundedHomepageIconTest.java | 1 + .../settings/dashboard/SummaryLoaderTest.java | 1 + .../AbnormalRingerConditionBaseTest.java | 1 + .../BackgroundDataConditionTest.java | 1 + .../conditional/ConditionAdapterTest.java | 4 +- .../dashboard/conditional/ConditionTest.java | 1 + .../conditional/DndConditionTest.java | 4 +- .../conditional/RingerMutedConditionTest.java | 1 + .../RingerVibrateConditionTest.java | 1 + .../suggestions/SuggestionAdapterTest.java | 1 + .../SuggestionFeatureProviderImplTest.java | 5 +- .../SuggestionStateProviderTest.java | 1 + .../datausage/AppDataUsagePreferenceTest.java | 1 + .../settings/datausage/AppDataUsageTest.java | 5 +- .../settings/datausage/AppPrefLoaderTest.java | 4 +- .../datausage/BillingCycleSettingsTest.java | 5 +- .../datausage/CellDataPreferenceTest.java | 4 +- .../ChartDataUsagePreferenceTest.java | 3 ++ .../settings/datausage/DataUsageListTest.java | 1 + .../datausage/DataUsageSummaryLegacyTest.java | 2 +- ...aUsageSummaryPreferenceControllerTest.java | 5 +- .../DataUsageSummaryPreferenceTest.java | 5 +- .../datausage/DataUsageSummaryTest.java | 1 + .../datausage/DataUsageUtilsTest.java | 1 + .../datausage/UnrestrictedDataAccessTest.java | 2 + ...utoTimeFormatPreferenceControllerTest.java | 3 +- .../AutoTimePreferenceControllerTest.java | 1 + .../AutoTimeZonePreferenceControllerTest.java | 2 + .../DatePreferenceControllerTest.java | 1 + .../datetime/TimeChangeListenerMixinTest.java | 1 + .../TimeFormatPreferenceControllerTest.java | 4 +- .../TimePreferenceControllerTest.java | 1 + .../TimeZonePreferenceControllerTest.java | 1 + .../timezone/BaseTimeZoneAdapterTest.java | 4 +- .../timezone/BaseTimeZoneInfoPickerTest.java | 4 +- .../BaseTimeZonePreferenceControllerTest.java | 6 +-- .../timezone/FixedOffsetPickerTest.java | 9 ++-- .../FixedOffsetPreferenceControllerTest.java | 5 +- .../RegionPreferenceControllerTest.java | 5 +- .../timezone/RegionZonePickerTest.java | 4 +- .../RegionZonePreferenceControllerTest.java | 5 +- .../datetime/timezone/SpannableUtilTest.java | 4 +- .../timezone/TimeZoneSettingsTest.java | 1 + .../timezone/model/TimeZoneDataTest.java | 9 ++-- ...erDescriptionPreferenceControllerTest.java | 1 + ...StorageManagerSwitchBarControllerTest.java | 2 + ...BluetoothA2dpPreferenceControllerTest.java | 7 ++- .../AdbPreferenceControllerTest.java | 4 +- ...ppsOnExternalPreferenceControllerTest.java | 11 ++-- ...DurationScalePreferenceControllerTest.java | 10 ++-- ...NotRespondingPreferenceControllerTest.java | 11 ++-- ...dProcessLimitPreferenceControllerTest.java | 1 + ...A2dpHwOffloadPreferenceControllerTest.java | 9 ++-- ...bsoluteVolumePreferenceControllerTest.java | 8 ++- ...BitsPerSamplePreferenceControllerTest.java | 4 +- ...ioChannelModePreferenceControllerTest.java | 4 +- ...othAudioCodecPreferenceControllerTest.java | 4 +- ...hAudioQualityPreferenceControllerTest.java | 4 +- ...dioSampleRatePreferenceControllerTest.java | 4 +- ...hAvrcpVersionPreferenceControllerTest.java | 6 ++- ...hDeviceNoNamePreferenceControllerTest.java | 8 ++- ...dAudioDevicesPreferenceControllerTest.java | 6 ++- ...toothSnoopLogPreferenceControllerTest.java | 8 ++- ...ReportInPowerPreferenceControllerTest.java | 11 ++-- .../BugReportPreferenceControllerTest.java | 1 + ...raLaserSensorPreferenceControllerTest.java | 8 ++- .../ClearAdbKeysPreferenceControllerTest.java | 8 ++- ...orTemperaturePreferenceControllerTest.java | 8 ++- .../DarkUIPreferenceControllerTest.java | 1 + ...ugGpuOverdrawPreferenceControllerTest.java | 4 +- ...lipOperationsPreferenceControllerTest.java | 4 +- ...iewAttributesPreferenceControllerTest.java | 4 +- ...elopmentSettingsDashboardFragmentTest.java | 1 + .../DevelopmentSwitchBarControllerTest.java | 6 ++- ...omaticUpdatesPreferenceControllerTest.java | 4 +- ...DisplayCutoutPreferenceControllerTest.java | 7 +-- ...sFullTrackingPreferenceControllerTest.java | 11 ++-- ...puDebugLayersPreferenceControllerTest.java | 11 ++-- ...ileEncryptionPreferenceControllerTest.java | 6 ++- ...eGpuRenderingPreferenceControllerTest.java | 8 ++- .../ForceMSAAPreferenceControllerTest.java | 4 +- ...eeformWindowsPreferenceControllerTest.java | 8 ++- ...puViewUpdatesPreferenceControllerTest.java | 6 ++- ...LayersUpdatesPreferenceControllerTest.java | 6 ++- ...dwareOverlaysPreferenceControllerTest.java | 7 ++- .../HdcpCheckingPreferenceControllerTest.java | 6 ++- ...eepActivitiesPreferenceControllerTest.java | 4 +- ...ackupPasswordPreferenceControllerTest.java | 1 + ...LocalTerminalPreferenceControllerTest.java | 7 ++- .../LogPersistPreferenceControllerTest.java | 3 +- .../LogdSizePreferenceControllerTest.java | 1 + ...eDataAlwaysOnPreferenceControllerTest.java | 4 +- ...ckLocationAppPreferenceControllerTest.java | 6 ++- ...annelWarningsPreferenceControllerTest.java | 4 +- .../OemUnlockPreferenceControllerTest.java | 8 ++- ...tureColorModePreferenceControllerTest.java | 5 +- ...interLocationPreferenceControllerTest.java | 4 +- ...eGpuRenderingPreferenceControllerTest.java | 4 +- ...zableActivityPreferenceControllerTest.java | 4 +- .../RtlLayoutPreferenceControllerTest.java | 4 +- ...ondaryDisplayPreferenceControllerTest.java | 2 + ...electDebugAppPreferenceControllerTest.java | 6 ++- ...gerThrottlingPreferenceControllerTest.java | 4 +- ...stCrashDialogPreferenceControllerTest.java | 11 ++-- ...wLayoutBoundsPreferenceControllerTest.java | 6 ++- ...urfaceUpdatesPreferenceControllerTest.java | 7 ++- .../ShowTapsPreferenceControllerTest.java | 4 +- ...ateColorSpacePreferenceControllerTest.java | 9 +++- .../StayAwakePreferenceControllerTest.java | 2 + .../StrictModePreferenceControllerTest.java | 6 ++- ...HardwareAccelPreferenceControllerTest.java | 4 +- ...nimationScalePreferenceControllerTest.java | 10 ++-- ...bAudioRoutingPreferenceControllerTest.java | 4 +- ...fyAppsOverUsbPreferenceControllerTest.java | 3 +- ...itForDebuggerPreferenceControllerTest.java | 11 ++-- ...RandomizationPreferenceControllerTest.java | 11 ++-- ...CertificationPreferenceControllerTest.java | 4 +- ...erboseLoggingPreferenceControllerTest.java | 3 +- ...nimationScalePreferenceControllerTest.java | 10 ++-- .../FeatureFlagPreferenceControllerTest.java | 5 +- ...velopmentTilePreferenceControllerTest.java | 4 +- .../development/qstile/WinscopeTraceTest.java | 2 + ...randedAccountPreferenceControllerTest.java | 1 + .../BuildNumberPreferenceControllerTest.java | 6 ++- .../deviceinfo/DeviceInfoSettingsTest.java | 5 +- .../DeviceModelPreferenceControllerTest.java | 3 ++ .../DeviceNamePreferenceControllerTest.java | 1 + ...ccEquipmentIdPreferenceControllerTest.java | 2 + .../FeedbackPreferenceControllerTest.java | 2 + .../ManualPreferenceControllerTest.java | 1 + .../deviceinfo/MyDeviceInfoFragmentTest.java | 4 +- .../PhoneNumberPreferenceControllerTest.java | 6 ++- ...PrivateVolumeOptionMenuControllerTest.java | 1 + ...egulatoryInfoPreferenceControllerTest.java | 2 + .../StorageDashboardFragmentTest.java | 4 +- .../deviceinfo/StorageItemPreferenceTest.java | 4 +- .../StorageProfileFragmentTest.java | 1 + .../BasebandVersionDialogControllerTest.java | 10 ++-- .../BuildNumberDialogControllerTest.java | 4 +- .../FirmwareVersionDialogControllerTest.java | 7 ++- ...rmwareVersionPreferenceControllerTest.java | 2 + .../KernelVersionDialogControllerTest.java | 4 +- ...ecurityPatchLevelDialogControllerTest.java | 7 ++- .../imei/ImeiInfoDialogControllerTest.java | 1 + .../ImeiInfoPreferenceControllerTest.java | 4 +- .../SimStatusDialogControllerTest.java | 4 +- .../SimStatusPreferenceControllerTest.java | 3 +- ...agementSwitchPreferenceControllerTest.java | 2 + .../CachedStorageValuesHelperTest.java | 17 ++++-- .../storage/SecondaryUserControllerTest.java | 5 +- .../StorageItemPreferenceControllerTest.java | 8 ++- ...eSummaryDonutPreferenceControllerTest.java | 5 +- .../storage/UserProfileControllerTest.java | 5 +- .../storage/VolumeSizesLoaderTest.java | 4 +- ...NotificationsPreferenceControllerTest.java | 3 ++ ...mbientDisplayPreferenceControllerTest.java | 2 + .../display/AmbientDisplaySettingsTest.java | 1 - .../settings/display/AppGridViewTest.java | 1 + ...utoBrightnessPreferenceControllerTest.java | 1 + .../AutoRotatePreferenceControllerTest.java | 2 + ...eryPercentagePreferenceControllerTest.java | 1 + ...ightnessLevelPreferenceControllerTest.java | 3 ++ .../ColorModePreferenceControllerTest.java | 1 + .../ColorModePreferenceFragmentTest.java | 2 + ...layActivationPreferenceControllerTest.java | 5 +- ...splayAutoModePreferenceControllerTest.java | 2 + ...CustomEndTimePreferenceControllerTest.java | 1 + ...stomStartTimePreferenceControllerTest.java | 1 + ...DisplayFooterPreferenceControllerTest.java | 1 + ...playIntensityPreferenceControllerTest.java | 2 + .../NightDisplayPreferenceControllerTest.java | 3 +- .../display/NightDisplaySettingsTest.java | 2 +- ...wOperatorNamePreferenceControllerTest.java | 2 + ...SystemUiThemePreferenceControllerTest.java | 1 + .../ThemePreferenceControllerTest.java | 4 +- .../TimeoutPreferenceControllerTest.java | 3 ++ .../VrDisplayPreferencePickerTest.java | 1 + .../WallpaperPreferenceControllerTest.java | 1 + .../dream/CurrentDreamPickerTest.java | 1 + .../CurrentDreamPreferenceControllerTest.java | 1 + .../settings/dream/DreamSettingsTest.java | 1 + .../StartNowPreferenceControllerTest.java | 4 +- .../settings/dream/WhenToDreamPickerTest.java | 1 + .../WhenToDreamPreferenceControllerTest.java | 1 + ...minActionPreferenceControllerTestBase.java | 4 +- ...rmissionsPreferenceControllerTestBase.java | 2 + ...pnCurrentUserPreferenceControllerTest.java | 2 + ...anagedProfilePreferenceControllerTest.java | 2 + .../ApplicationListFragmentTest.java | 3 ++ ...plicationListPreferenceControllerTest.java | 3 ++ ...ackupsEnabledPreferenceControllerTest.java | 2 + .../BugReportsPreferenceControllerTest.java | 1 + ...tsCurrentUserPreferenceControllerTest.java | 1 + .../CaCertsPreferenceControllerTestBase.java | 2 + ...alledPackagesPreferenceControllerTest.java | 2 + ...erprisePrivacyFeatureProviderImplTest.java | 1 + ...rprisePrivacyPreferenceControllerTest.java | 2 + .../EnterprisePrivacySettingsTest.java | 1 + ...erpriseSetDefaultAppsListFragmentTest.java | 2 + ...faultAppsListPreferenceControllerTest.java | 2 + ...etDefaultAppsPreferenceControllerTest.java | 2 + ...swordWipePreferenceControllerTestBase.java | 2 + ...obalHttpProxyPreferenceControllerTest.java | 2 + .../ImePreferenceControllerTest.java | 2 + ...geDeviceAdminPreferenceControllerTest.java | 2 + .../NetworkLogsPreferenceControllerTest.java | 1 + .../SecurityLogsPreferenceControllerTest.java | 1 + .../FingerprintEnrollEnrollingTest.java | 1 + .../FingerprintEnrollFindSensorTest.java | 1 + ...ngerprintEnrollSuggestionActivityTest.java | 1 + .../FingerprintPreferenceTest.java | 4 +- ...ProfileStatusPreferenceControllerTest.java | 2 + ...erprintStatusPreferenceControllerTest.java | 3 ++ .../FingerprintSuggestionActivityTest.java | 1 + ...etupFingerprintEnrollIntroductionTest.java | 4 +- .../AdvancedPowerUsageDetailTest.java | 3 ++ .../AppButtonsPreferenceControllerTest.java | 1 + ...toRestrictionPreferenceControllerTest.java | 1 + ...roundActivityPreferenceControllerTest.java | 2 + ...atteryAppListPreferenceControllerTest.java | 4 +- .../BatteryBroadcastReceiverTest.java | 1 + .../fuelgauge/BatteryDatabaseManagerTest.java | 1 + .../settings/fuelgauge/BatteryEntryTest.java | 1 + ...BatteryHeaderPreferenceControllerTest.java | 7 ++- .../BatteryHistoryPreferenceTest.java | 4 +- .../fuelgauge/BatteryInfoLoaderTest.java | 1 + .../settings/fuelgauge/BatteryInfoTest.java | 2 +- .../fuelgauge/BatteryMeterViewTest.java | 1 + ...yOptimizationPreferenceControllerTest.java | 4 +- .../fuelgauge/BatterySaverControllerTest.java | 1 + .../settings/fuelgauge/BatteryUtilsTest.java | 3 +- .../ButtonActionDialogFragmentTest.java | 1 + .../fuelgauge/PowerGaugePreferenceTest.java | 3 +- .../fuelgauge/PowerUsageAdvancedTest.java | 3 +- .../PowerUsageAnomalyDetailsTest.java | 7 ++- .../fuelgauge/PowerUsageSummaryTest.java | 2 +- .../RestrictAppPreferenceControllerTest.java | 2 +- .../fuelgauge/RestrictedAppDetailsTest.java | 6 +-- .../SmartBatteryPreferenceControllerTest.java | 1 + .../anomaly/AnomalyDetectionPolicyTest.java | 1 + .../anomaly/AnomalyDialogFragmentTest.java | 1 + .../fuelgauge/anomaly/AnomalyLoaderTest.java | 1 + ...nomalySummaryPreferenceControllerTest.java | 2 + .../fuelgauge/anomaly/AnomalyUtilsTest.java | 1 + .../action/BackgroundCheckActionTest.java | 1 + .../anomaly/action/ForceStopActionTest.java | 1 + .../action/StopAndBackgroundActionTest.java | 1 + .../BluetoothScanAnomalyDetectorTest.java | 1 + .../checker/WakeLockAnomalyDetectorTest.java | 1 + .../WakeupAlarmAnomalyDetectorTest.java | 1 + ...oBatterySaverPreferenceControllerTest.java | 1 + ...atterySeekBarPreferenceControllerTest.java | 3 +- ...rySaverButtonPreferenceControllerTest.java | 4 +- .../AnomalyConfigJobServiceTest.java | 1 - .../AnomalyDetectionJobServiceTest.java | 3 +- ...atteryManagerPreferenceControllerTest.java | 1 + .../batterytip/BatteryTipLoaderTest.java | 1 + .../BatteryTipPreferenceControllerTest.java | 4 +- .../batterytip/BatteryTipUtilsTest.java | 1 + .../actions/RestrictAppActionTest.java | 3 -- .../actions/UnrestrictAppActionTest.java | 2 - .../detectors/EarlyWarningDetectorTest.java | 1 + .../detectors/HighUsageDetectorTest.java | 1 - .../detectors/SmartBatteryDetectorTest.java | 1 + .../detectors/SummaryDetectorTest.java | 1 + .../batterytip/tips/BatteryTipTest.java | 1 + .../batterytip/tips/LowBatteryTipTest.java | 1 - .../batterytip/tips/RestrictAppTipTest.java | 1 - ...stureSettingsPreferenceControllerTest.java | 1 + .../gestures/AssistGestureSettingsTest.java | 1 + ...oubleTapPowerPreferenceControllerTest.java | 3 -- ...ubleTapScreenPreferenceControllerTest.java | 1 + .../DoubleTwistPreferenceControllerTest.java | 1 + .../GesturePreferenceControllerTest.java | 3 +- .../gestures/GestureSettingsTest.java | 1 + ...turesSettingsPreferenceControllerTest.java | 2 + ...PickupGesturePreferenceControllerTest.java | 1 + ...reventRingingPreferenceControllerTest.java | 13 +---- ...oNotificationPreferenceControllerTest.java | 2 + .../SwipeUpPreferenceControllerTest.java | 6 --- .../settings/graph/UsageGraphTest.java | 1 + ...ameControllerPreferenceControllerTest.java | 2 + ...sicalKeyboardPreferenceControllerTest.java | 4 +- .../SpellCheckerPreferenceControllerTest.java | 4 +- ...rtualKeyboardPreferenceControllerTest.java | 6 ++- .../LanguageAndInputSettingsTest.java | 4 +- ...PhoneLanguagePreferenceControllerTest.java | 2 + .../language/PointerSpeedControllerTest.java | 1 + .../language/TtsPreferenceControllerTest.java | 2 + ...serDictionaryPreferenceControllerTest.java | 1 + ...toothScanningPreferenceControllerTest.java | 2 + .../location/InjectedSettingTest.java | 1 + .../location/LocationEnablerTest.java | 5 +- ...ocationFooterPreferenceControllerTest.java | 4 +- ...cationForWorkPreferenceControllerTest.java | 4 +- .../LocationPreferenceControllerTest.java | 5 +- ...cationServicePreferenceControllerTest.java | 10 ++-- .../location/LocationSliceBuilderTest.java | 14 ++--- .../LocationSwitchBarControllerTest.java | 3 +- ...cationRequestPreferenceControllerTest.java | 14 +++-- ...RequestSeeAllPreferenceControllerTest.java | 3 +- .../WifiScanningPreferenceControllerTest.java | 2 + .../AirplaneModePreferenceControllerTest.java | 6 ++- .../settings/network/ApnEditorTest.java | 9 ++-- ...MobileNetworkPreferenceControllerTest.java | 9 ++-- .../network/NetworkDashboardFragmentTest.java | 4 +- .../NetworkResetPreferenceControllerTest.java | 1 + .../NetworkResetRestrictionCheckerTest.java | 1 + ...kScorerPickerPreferenceControllerTest.java | 2 + .../network/NetworkScorerPickerTest.java | 2 + .../PrivateDnsModeDialogPreferenceTest.java | 11 ++-- .../PrivateDnsPreferenceControllerTest.java | 18 +++---- .../TetherPreferenceControllerTest.java | 1 + .../network/VpnPreferenceControllerTest.java | 7 ++- .../AndroidBeamPreferenceControllerTest.java | 1 + .../nfc/NfcAirplaneModeObserverTest.java | 1 + .../nfc/NfcForegroundPreferenceTest.java | 2 + .../nfc/NfcPreferenceControllerTest.java | 1 + .../settings/nfc/PaymentSettingsTest.java | 1 + ...umeRestrictedPreferenceControllerTest.java | 2 + .../AlarmVolumePreferenceControllerTest.java | 1 + .../AllowSoundPreferenceControllerTest.java | 3 ++ .../AppLinkPreferenceControllerTest.java | 3 ++ .../BadgePreferenceControllerTest.java | 3 ++ ...gNotificationPreferenceControllerTest.java | 2 + .../BlockPreferenceControllerTest.java | 2 + .../BootSoundPreferenceControllerTest.java | 4 +- .../CallVolumePreferenceControllerTest.java | 1 - ...ChargingSoundPreferenceControllerTest.java | 4 +- ...letedChannelsPreferenceControllerTest.java | 2 + .../DescriptionPreferenceControllerTest.java | 3 ++ .../DialPadTonePreferenceControllerTest.java | 6 ++- .../DndPreferenceControllerTest.java | 5 +- ...ockAudioMediaPreferenceControllerTest.java | 2 + .../DockingSoundPreferenceControllerTest.java | 4 +- ...encyBroadcastPreferenceControllerTest.java | 1 + ...EmergencyTonePreferenceControllerTest.java | 4 +- .../HeaderPreferenceControllerTest.java | 5 +- .../ImportancePreferenceControllerTest.java | 5 +- .../LightsPreferenceControllerTest.java | 3 ++ .../NotificationAppPreferenceTest.java | 6 ++- .../NotificationPreferenceControllerTest.java | 3 ++ ...icationVolumePreferenceControllerTest.java | 1 + ...ificationsOffPreferenceControllerTest.java | 3 ++ ...PhoneRingtonePreferenceControllerTest.java | 1 + ...eNotificationPreferenceControllerTest.java | 3 ++ ...NotifyingAppsPreferenceControllerTest.java | 4 +- .../RingVolumePreferenceControllerTest.java | 1 + .../RingtonePreferenceControllerBaseTest.java | 2 + ...reenLockSoundPreferenceControllerTest.java | 4 +- .../SettingPrefControllerTest.java | 3 ++ .../SoundPreferenceControllerTest.java | 5 +- .../notification/SoundSettingsTest.java | 3 +- .../notification/SuppressorHelperTest.java | 1 + .../TouchSoundPreferenceControllerTest.java | 4 +- ...ibrateOnTouchPreferenceControllerTest.java | 4 +- ...brateWhenRingPreferenceControllerTest.java | 3 +- .../VibrationPreferenceControllerTest.java | 3 ++ .../VisibilityPreferenceControllerTest.java | 2 + ...VolumeSeekBarPreferenceControllerTest.java | 2 + .../WorkSoundPreferenceControllerTest.java | 4 +- .../ZenCustomRadioButtonPreferenceTest.java | 8 +-- .../ZenFooterPreferenceControllerTest.java | 1 + ...ZenModeAlarmsPreferenceControllerTest.java | 4 +- ...utomaticRulesPreferenceControllerTest.java | 2 + ...BehaviorCallsPreferenceControllerTest.java | 1 + ...ehaviorFooterPreferenceControllerTest.java | 8 +-- ...EventReminderPreferenceControllerTest.java | 1 + ...BehaviorSoundPreferenceControllerTest.java | 1 + ...ZenModeButtonPreferenceControllerTest.java | 6 ++- .../ZenModeCallsPreferenceControllerTest.java | 1 + ...nModeDurationPreferenceControllerTest.java | 2 +- ...ZenModeEventsPreferenceControllerTest.java | 4 +- .../ZenModeMediaPreferenceControllerTest.java | 4 +- ...nModeMessagesPreferenceControllerTest.java | 2 + .../ZenModePreferenceControllerTest.java | 2 + ...ModeRemindersPreferenceControllerTest.java | 4 +- ...RepeatCallersPreferenceControllerTest.java | 4 +- .../ZenModeScheduleRuleSettingsTest.java | 1 + ...ettingsFooterPreferenceControllerTest.java | 5 +- .../notification/ZenModeSettingsTest.java | 1 + .../notification/ZenModeSliceBuilderTest.java | 15 +++--- ...arredContactsPreferenceControllerTest.java | 1 + ...ZenModeSystemPreferenceControllerTest.java | 8 ++- ...ModeVisEffectPreferenceControllerTest.java | 6 +-- ...VisEffectsAllPreferenceControllerTest.java | 7 +-- ...EffectsCustomPreferenceControllerTest.java | 7 +-- ...isEffectsNonePreferenceControllerTest.java | 6 +-- .../ChooseLockGenericControllerTest.java | 1 + .../password/ChooseLockPasswordTest.java | 1 + .../password/ChooseLockPatternTest.java | 1 + .../ChooseLockSettingsHelperTest.java | 1 + .../password/SetNewPasswordActivityTest.java | 1 + .../SetNewPasswordControllerTest.java | 3 ++ .../password/SetupChooseLockPasswordTest.java | 1 + ...PrintSettingsPreferenceControllerTest.java | 5 +- .../search/BaseSearchIndexProviderTest.java | 1 + .../search/DatabaseIndexingManagerTest.java | 1 + .../DeviceIndexUpdateJobServiceTest.java | 11 ++-- .../settings/search/InlinePayloadTest.java | 1 + .../search/InlineSwitchPayloadTest.java | 1 + .../search/ResultPayloadUtilsTest.java | 1 + .../search/SearchFeatureProviderImplTest.java | 1 + .../search/SearchIndexableResourcesTest.java | 3 ++ .../SettingsSearchIndexablesProviderTest.java | 1 + .../indexing/IndexDataConverterTest.java | 8 +-- .../indexing/PreIndexDataCollectorTest.java | 1 + ...ngeScreenLockPreferenceControllerTest.java | 1 + ...entialStoragePreferenceControllerTest.java | 1 + .../security/EncryptionAndCredentialTest.java | 2 + ...ryptionStatusPreferenceControllerTest.java | 8 ++- ...ckUnificationPreferenceControllerTest.java | 2 + ...ockdownButtonPreferenceControllerTest.java | 2 + .../OwnerInfoPreferenceControllerTest.java | 2 + ...tedEncryptionPreferenceControllerTest.java | 3 +- ...ScreenPinningPreferenceControllerTest.java | 1 + .../ShowPasswordPreferenceControllerTest.java | 2 + .../SimLockPreferenceControllerTest.java | 7 ++- ...atternProfilePreferenceControllerTest.java | 6 ++- ...kAfterTimeoutPreferenceControllerTest.java | 2 + .../LockScreenPreferenceControllerTest.java | 7 ++- ...atternVisiblePreferenceControllerTest.java | 2 + ...onInstantLockPreferenceControllerTest.java | 2 + .../screenlock/ScreenLockSettingsTest.java | 1 + ...geTrustAgentsPreferenceControllerTest.java | 2 + ...rustAgentListPreferenceControllerTest.java | 11 ++-- .../trustagent/TrustAgentManagerTest.java | 1 + .../slices/SettingsSliceProviderTest.java | 6 ++- .../slices/SliceBroadcastReceiverTest.java | 3 +- .../slices/SliceBuilderUtilsTest.java | 9 ++-- .../SliceControllerInXmlCodeInspector.java | 1 + .../slices/SliceDataConverterTest.java | 2 +- .../slices/SlicesDatabaseAccessorTest.java | 5 +- .../slices/SlicesDatabaseHelperTest.java | 1 + ...oOutputSwitchPreferenceControllerTest.java | 6 +-- ...ProfileOutputPreferenceControllerTest.java | 1 + .../MediaOutputPreferenceControllerTest.java | 1 + .../suggestions/SettingsSuggestionsTest.java | 1 - .../NewDeviceIntroSuggestionActivityTest.java | 11 ++-- .../settings/survey/SurveyMixinTest.java | 2 + .../SystemUpdatePreferenceControllerTest.java | 3 ++ .../SettingsRobolectricTestRunner.java | 4 +- .../settings/testutils/SliceTester.java | 19 +++---- .../settings/testutils/XmlTestUtils.java | 5 +- .../shadow/SettingsShadowBluetoothDevice.java | 3 -- .../shadow/SettingsShadowResources.java | 8 +-- .../testutils/shadow/ShadowAppInfoBase.java | 1 + .../testutils/shadow/ShadowAudioHelper.java | 2 + .../testutils/shadow/ShadowAudioManager.java | 2 +- .../testutils/shadow/ShadowCardView.java | 3 +- .../shadow/ShadowContentResolver.java | 7 ++- .../shadow/ShadowDataSaverBackend.java | 1 + .../shadow/ShadowDataUsageUtils.java | 1 + .../shadow/ShadowDatabaseIndexingUtils.java | 2 + .../shadow/ShadowFingerprintManager.java | 1 + .../testutils/shadow/ShadowMediaRouter.java | 4 +- ...adowMobileNetworkPreferenceController.java | 2 + .../shadow/ShadowPermissionChecker.java | 3 +- .../shadow/ShadowRestrictionUtils.java | 2 + .../shadow/ShadowRunnableAsyncTask.java | 1 + .../ShadowRuntimePermissionPresenter.java | 1 - .../ShadowSettingsPreferenceFragment.java | 1 + .../shadow/ShadowShortcutManager.java | 4 +- .../testutils/shadow/ShadowTextUtils.java | 4 +- ...serWhenLockedPreferenceControllerTest.java | 4 +- .../AutoSyncDataPreferenceControllerTest.java | 4 +- ...cPersonalDataPreferenceControllerTest.java | 2 + ...oSyncWorkDataPreferenceControllerTest.java | 1 + .../settings/users/UserCapabilitiesTest.java | 1 + .../users/UserFeatureProviderImplTest.java | 1 + .../settings/users/UserPreferenceTest.java | 1 + .../settings/users/UserSettingsTest.java | 1 + .../android/settings/vpn2/VpnUtilsTest.java | 1 + .../WallpaperSuggestionActivityTest.java | 1 + .../wallpaper/WallpaperTypeSettingsTest.java | 2 + .../webview/WebViewAppPickerTest.java | 2 + .../settings/wfd/WifiDisplaySettingsTest.java | 1 + .../widget/ActionBarShadowControllerTest.java | 5 +- .../widget/ActionButtonPreferenceTest.java | 4 +- .../settings/widget/AppPreferenceTest.java | 3 +- .../widget/AppSwitchPreferenceTest.java | 3 +- .../DisabledCheckBoxPreferenceTest.java | 10 ++-- .../widget/EntityHeaderControllerTest.java | 4 +- .../FixedLineSummaryPreferenceTest.java | 3 +- ...ghlightablePreferenceGroupAdapterTest.java | 4 +- .../HotspotApBandSelectionPreferenceTest.java | 5 -- .../widget/LoadingViewControllerTest.java | 1 + .../widget/MasterCheckBoxPreferenceTest.java | 6 ++- .../widget/MasterSwitchPreferenceTest.java | 6 ++- .../PreferenceCategoryControllerTest.java | 1 + .../widget/RadioButtonPickerFragmentTest.java | 2 + .../widget/RadioButtonPreferenceTest.java | 4 +- .../widget/RtlCompatibleViewPagerTest.java | 3 +- .../widget/ScrollToParentEditTextTest.java | 1 + .../settings/widget/SwitchBarTest.java | 3 +- .../widget/TwoStateButtonPreferenceTest.java | 1 + ...tableListPreferenceDialogFragmentTest.java | 8 +-- .../ValidatedEditTextPreferenceTest.java | 4 +- .../settings/widget/VideoPreferenceTest.java | 3 +- .../AppStateChangeWifiStateBridgeTest.java | 3 +- ...lularFallbackPreferenceControllerTest.java | 1 + .../wifi/ChangeWifiStateDetailsTest.java | 1 + .../wifi/ConfigureWifiSettingsTest.java | 1 + .../settings/wifi/LinkablePreferenceTest.java | 3 +- ...fyOpenNetworkPreferenceControllerTest.java | 5 +- .../UseOpenWifiPreferenceControllerTest.java | 6 ++- .../wifi/WifiConfigControllerTest.java | 1 + .../settings/wifi/WifiDialogActivityTest.java | 1 + .../settings/wifi/WifiEnablerTest.java | 1 - .../WifiInfoPreferenceControllerTest.java | 5 +- ...iMasterSwitchPreferenceControllerTest.java | 1 + .../settings/wifi/WifiSettingsTest.java | 1 + .../settings/wifi/WifiSliceBuilderTest.java | 23 ++++---- .../settings/wifi/WifiSummaryUpdaterTest.java | 1 + .../WifiWakeupPreferenceControllerTest.java | 5 +- .../wifi/WriteWifiConfigToNfcDialogTest.java | 1 + .../calling/WifiCallingSliceHelperTest.java | 2 - .../WifiDetailPreferenceControllerTest.java | 8 +-- .../WifiMeteredPreferenceControllerTest.java | 2 + .../P2pCategoryPreferenceControllerTest.java | 1 + ...P2pThisDevicePreferenceControllerTest.java | 2 + .../p2p/WifiP2PPreferenceControllerTest.java | 5 +- .../wifi/tether/TetherServiceTest.java | 1 + ...iTetherApBandPreferenceControllerTest.java | 2 + ...TetherAutoOffPreferenceControllerTest.java | 1 + ...etherPasswordPreferenceControllerTest.java | 2 + .../WifiTetherPreferenceControllerTest.java | 10 ++-- ...ifiTetherSSIDPreferenceControllerTest.java | 2 + ...etherSecurityPreferenceControllerTest.java | 2 +- .../WifiTetherSwitchBarControllerTest.java | 1 - 1568 files changed, 3599 insertions(+), 2122 deletions(-) diff --git a/src/com/android/settings/AccessiblePreferenceCategory.java b/src/com/android/settings/AccessiblePreferenceCategory.java index 494dee5b933..6e1a3d5f408 100644 --- a/src/com/android/settings/AccessiblePreferenceCategory.java +++ b/src/com/android/settings/AccessiblePreferenceCategory.java @@ -17,6 +17,7 @@ package com.android.settings; import android.content.Context; + import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceViewHolder; diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java index 86d8336d255..b3cf4335789 100644 --- a/src/com/android/settings/BrightnessPreference.java +++ b/src/com/android/settings/BrightnessPreference.java @@ -19,9 +19,10 @@ package com.android.settings; import android.content.Context; import android.content.Intent; import android.os.UserHandle; -import androidx.preference.Preference; import android.util.AttributeSet; +import androidx.preference.Preference; + public class BrightnessPreference extends Preference { public BrightnessPreference(Context context, AttributeSet attrs) { diff --git a/src/com/android/settings/CancellablePreference.java b/src/com/android/settings/CancellablePreference.java index 92c100327cf..4288e8b60f8 100644 --- a/src/com/android/settings/CancellablePreference.java +++ b/src/com/android/settings/CancellablePreference.java @@ -16,13 +16,14 @@ package com.android.settings; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.view.View.OnClickListener; import android.widget.ImageView; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + public class CancellablePreference extends Preference implements OnClickListener { private boolean mCancellable; diff --git a/src/com/android/settings/CustomListPreference.java b/src/com/android/settings/CustomListPreference.java index cb87440f7a6..97910ec9420 100644 --- a/src/com/android/settings/CustomListPreference.java +++ b/src/com/android/settings/CustomListPreference.java @@ -25,10 +25,11 @@ import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.os.Bundle; -import androidx.preference.ListPreferenceDialogFragment; -import androidx.preference.ListPreference; import android.util.AttributeSet; +import androidx.preference.ListPreference; +import androidx.preference.ListPreferenceDialogFragment; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/FallbackHome.java b/src/com/android/settings/FallbackHome.java index 5f7b6392369..9207dc869ad 100644 --- a/src/com/android/settings/FallbackHome.java +++ b/src/com/android/settings/FallbackHome.java @@ -17,24 +17,21 @@ package com.android.settings; import android.app.Activity; -import android.app.ProgressDialog; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.os.UserHandle; import android.os.PowerManager; import android.os.SystemClock; +import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; import android.util.Log; import android.view.View; -import android.view.WindowManager; import android.view.WindowManager.LayoutParams; import android.view.animation.AnimationUtils; diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java index 7d493ebe407..437f42e424a 100644 --- a/src/com/android/settings/IccLockSettings.java +++ b/src/com/android/settings/IccLockSettings.java @@ -25,8 +25,6 @@ import android.os.AsyncResult; import android.os.Bundle; import android.os.Handler; import android.os.Message; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -43,6 +41,10 @@ import android.widget.TabHost.TabContentFactory; import android.widget.TabHost.TabSpec; import android.widget.TabWidget; 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.Phone; import com.android.internal.telephony.PhoneFactory; diff --git a/src/com/android/settings/LegalSettings.java b/src/com/android/settings/LegalSettings.java index 2bdfa3b23fb..9cb62434498 100644 --- a/src/com/android/settings/LegalSettings.java +++ b/src/com/android/settings/LegalSettings.java @@ -24,11 +24,11 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; import android.provider.SearchIndexableResource; + import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceGroup; 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; diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java index a7da41692fa..6299217b943 100644 --- a/src/com/android/settings/MasterClear.java +++ b/src/com/android/settings/MasterClear.java @@ -38,7 +38,6 @@ import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.telephony.euicc.EuiccManager; import android.text.TextUtils; import android.util.Log; @@ -54,6 +53,8 @@ import android.widget.LinearLayout; import android.widget.ScrollView; 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; diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java index a92c8f85c7e..0ea72507364 100644 --- a/src/com/android/settings/MasterClearConfirm.java +++ b/src/com/android/settings/MasterClearConfirm.java @@ -16,6 +16,8 @@ package com.android.settings; +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + import android.app.ProgressDialog; import android.content.Context; import android.content.Intent; @@ -37,8 +39,6 @@ import com.android.settings.core.InstrumentedFragment; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settingslib.RestrictedLockUtils; -import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - /** * Confirm and execute a reset of the device to a clean "just out of the box" * state. Multiple confirmations are required: first, a general "are you sure diff --git a/src/com/android/settings/PreviewPagerAdapter.java b/src/com/android/settings/PreviewPagerAdapter.java index b98ffcb1a11..8d83cb4e071 100644 --- a/src/com/android/settings/PreviewPagerAdapter.java +++ b/src/com/android/settings/PreviewPagerAdapter.java @@ -19,7 +19,6 @@ import android.animation.Animator; import android.animation.Animator.AnimatorListener; import android.content.Context; import android.content.res.Configuration; -import androidx.viewpager.widget.PagerAdapter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -30,7 +29,8 @@ import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; import android.widget.FrameLayout; import android.widget.LinearLayout; -import android.widget.ScrollView; + +import androidx.viewpager.widget.PagerAdapter; /** * A PagerAdapter used by PreviewSeekBarPreferenceFragment that for showing multiple preview screen diff --git a/src/com/android/settings/PreviewSeekBarPreferenceFragment.java b/src/com/android/settings/PreviewSeekBarPreferenceFragment.java index e031edb26c3..6cbd619b4e8 100644 --- a/src/com/android/settings/PreviewSeekBarPreferenceFragment.java +++ b/src/com/android/settings/PreviewSeekBarPreferenceFragment.java @@ -19,8 +19,6 @@ package com.android.settings; import android.content.Context; import android.content.res.Configuration; import android.os.Bundle; -import androidx.viewpager.widget.ViewPager; -import androidx.viewpager.widget.ViewPager.OnPageChangeListener; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; @@ -30,6 +28,9 @@ import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.TextView; +import androidx.viewpager.widget.ViewPager; +import androidx.viewpager.widget.ViewPager.OnPageChangeListener; + import com.android.settings.widget.DotsPageIndicator; import com.android.settings.widget.LabeledSeekBar; diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java index 0ae9cb135f9..cfb95a44869 100644 --- a/src/com/android/settings/PrivacySettings.java +++ b/src/com/android/settings/PrivacySettings.java @@ -27,21 +27,17 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; -import android.provider.SearchIndexableResource; import android.provider.Settings; +import android.util.Log; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceScreen; -import android.util.Log; +import androidx.preference.SwitchPreference; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; -import com.android.settingslib.RestrictedLockUtils; -import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.List; diff --git a/src/com/android/settings/ProgressCategory.java b/src/com/android/settings/ProgressCategory.java index eeb7bfe033f..804d48b30b7 100644 --- a/src/com/android/settings/ProgressCategory.java +++ b/src/com/android/settings/ProgressCategory.java @@ -17,11 +17,12 @@ package com.android.settings; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + /** * A category with a progress spinner */ diff --git a/src/com/android/settings/ProgressCategoryBase.java b/src/com/android/settings/ProgressCategoryBase.java index 89ded4ba01e..1b06e07be5d 100644 --- a/src/com/android/settings/ProgressCategoryBase.java +++ b/src/com/android/settings/ProgressCategoryBase.java @@ -17,9 +17,10 @@ package com.android.settings; import android.content.Context; -import androidx.preference.PreferenceCategory; import android.util.AttributeSet; +import androidx.preference.PreferenceCategory; + public abstract class ProgressCategoryBase extends PreferenceCategory { public ProgressCategoryBase(Context context) { super(context); diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java index 557c39b1648..ee20c586e9b 100644 --- a/src/com/android/settings/RadioInfo.java +++ b/src/com/android/settings/RadioInfo.java @@ -21,7 +21,6 @@ import static android.provider.Settings.Global.PREFERRED_NETWORK_MODE; import android.app.Activity; import android.app.AlertDialog; -import android.app.Dialog; import android.app.QueuedWork; import android.content.ComponentName; import android.content.Context; @@ -42,23 +41,23 @@ import android.os.Handler; import android.os.Message; import android.provider.Settings; import android.telephony.CarrierConfigManager; +import android.telephony.CellIdentityCdma; +import android.telephony.CellIdentityGsm; +import android.telephony.CellIdentityLte; +import android.telephony.CellIdentityWcdma; import android.telephony.CellInfo; import android.telephony.CellInfoCdma; import android.telephony.CellInfoGsm; import android.telephony.CellInfoLte; import android.telephony.CellInfoWcdma; -import android.telephony.CellIdentityCdma; -import android.telephony.CellIdentityGsm; -import android.telephony.CellIdentityLte; -import android.telephony.CellIdentityWcdma; import android.telephony.CellLocation; import android.telephony.CellSignalStrengthCdma; import android.telephony.CellSignalStrengthGsm; import android.telephony.CellSignalStrengthLte; import android.telephony.CellSignalStrengthWcdma; -import android.telephony.PreciseCallState; import android.telephony.PhoneStateListener; import android.telephony.PhysicalChannelConfig; +import android.telephony.PreciseCallState; import android.telephony.ServiceState; import android.telephony.SignalStrength; import android.telephony.SubscriptionManager; @@ -85,16 +84,11 @@ import com.android.ims.ImsConfig; 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.internal.telephony.PhoneFactory; -import com.android.internal.telephony.RILConstants; -import com.android.internal.telephony.TelephonyProperties; import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; -import java.net.UnknownHostException; -import java.util.ArrayList; import java.util.List; public class RadioInfo extends Activity { diff --git a/src/com/android/settings/RegulatoryInfoDisplayActivity.java b/src/com/android/settings/RegulatoryInfoDisplayActivity.java index 2f35221294f..fc87efdb62b 100644 --- a/src/com/android/settings/RegulatoryInfoDisplayActivity.java +++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.java @@ -25,13 +25,14 @@ import android.graphics.BitmapFactory; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.SystemProperties; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.view.Gravity; import android.view.View; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import java.util.Locale; /** diff --git a/src/com/android/settings/RemoteBugreportActivity.java b/src/com/android/settings/RemoteBugreportActivity.java index 0589a24c50b..7069175bfcc 100644 --- a/src/com/android/settings/RemoteBugreportActivity.java +++ b/src/com/android/settings/RemoteBugreportActivity.java @@ -24,9 +24,6 @@ import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; import android.util.Log; -import android.widget.LinearLayout; - -import com.android.settings.R; /** * UI for the remote bugreport dialog. Shows one of 3 possible dialogs: diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java index 99f2df63e0a..8ab6dc397ab 100644 --- a/src/com/android/settings/ResetNetworkConfirm.java +++ b/src/com/android/settings/ResetNetworkConfirm.java @@ -33,16 +33,16 @@ import android.os.RecoverySystem; import android.os.UserHandle; import android.os.UserManager; import android.provider.Telephony; -import androidx.annotation.VisibleForTesting; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; + import com.android.ims.ImsManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; diff --git a/src/com/android/settings/RestrictedCheckBox.java b/src/com/android/settings/RestrictedCheckBox.java index 476df29bf04..2d45880076f 100644 --- a/src/com/android/settings/RestrictedCheckBox.java +++ b/src/com/android/settings/RestrictedCheckBox.java @@ -22,8 +22,6 @@ import android.content.Context; import android.graphics.PorterDuff; import android.util.AttributeSet; import android.widget.CheckBox; -import android.widget.RadioButton; -import android.widget.TextView; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/RestrictedListPreference.java b/src/com/android/settings/RestrictedListPreference.java index 4cfb2cf1510..d4315878156 100644 --- a/src/com/android/settings/RestrictedListPreference.java +++ b/src/com/android/settings/RestrictedListPreference.java @@ -16,18 +16,15 @@ package com.android.settings; -import android.app.ActivityManager; +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + import android.app.AlertDialog; import android.app.KeyguardManager; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.os.RemoteException; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.ListPreferenceDialogFragment; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; @@ -38,15 +35,15 @@ import android.widget.ImageView; import android.widget.ListAdapter; import android.widget.ListView; -import com.android.settings.Utils; +import androidx.preference.ListPreferenceDialogFragment; +import androidx.preference.PreferenceViewHolder; + import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreferenceHelper; import java.util.ArrayList; import java.util.List; -import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - public class RestrictedListPreference extends CustomListPreference { private final RestrictedPreferenceHelper mHelper; private final List mRestrictedItems = new ArrayList<>(); diff --git a/src/com/android/settings/RestrictedRadioButton.java b/src/com/android/settings/RestrictedRadioButton.java index 6ff66ba50fa..7efba4fbaf9 100644 --- a/src/com/android/settings/RestrictedRadioButton.java +++ b/src/com/android/settings/RestrictedRadioButton.java @@ -16,18 +16,16 @@ package com.android.settings; +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + import android.content.Context; import android.graphics.PorterDuff; import android.util.AttributeSet; import android.widget.RadioButton; import android.widget.TextView; -import java.util.List; - import com.android.settingslib.RestrictedLockUtils; -import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - public class RestrictedRadioButton extends RadioButton { private Context mContext; private boolean mDisabledByAdmin; diff --git a/src/com/android/settings/RestrictedSettingsFragment.java b/src/com/android/settings/RestrictedSettingsFragment.java index 3392d8c3bcb..68bf4e8d134 100644 --- a/src/com/android/settings/RestrictedSettingsFragment.java +++ b/src/com/android/settings/RestrictedSettingsFragment.java @@ -16,6 +16,8 @@ package com.android.settings; +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + import android.app.Activity; import android.app.AlertDialog; import android.content.BroadcastReceiver; @@ -27,16 +29,15 @@ import android.os.Bundle; import android.os.PersistableBundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; import android.view.View; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.android.settings.dashboard.RestrictedDashboardFragment; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settingslib.RestrictedLockUtils; -import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - /** * Base class for settings screens that should be pin protected when in restricted mode or * that will display an admin support message in case an admin has disabled the options. diff --git a/src/com/android/settings/RingtonePreference.java b/src/com/android/settings/RingtonePreference.java index 98f0579d661..8f9c618d5e8 100644 --- a/src/com/android/settings/RingtonePreference.java +++ b/src/com/android/settings/RingtonePreference.java @@ -24,11 +24,12 @@ import android.media.RingtoneManager; import android.net.Uri; import android.os.UserHandle; import android.provider.Settings.System; -import androidx.preference.Preference; -import androidx.preference.PreferenceManager; import android.text.TextUtils; import android.util.AttributeSet; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; + /** * A {@link Preference} that allows the user to choose a ringtone from those on the device. * The chosen ringtone's URI will be persisted as a string. diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 7e77047cfbc..abe48d68ed9 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -39,11 +39,6 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceFragment; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceManager; import android.text.TextUtils; import android.transition.TransitionManager; import android.util.FeatureFlagUtils; @@ -54,6 +49,12 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.Toolbar; +import androidx.annotation.VisibleForTesting; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceManager; + import com.android.internal.util.ArrayUtils; import com.android.settings.Settings.WifiSettingsActivity; import com.android.settings.applications.manageapplications.ManageApplications; diff --git a/src/com/android/settings/SettingsInitialize.java b/src/com/android/settings/SettingsInitialize.java index 7272399247f..141d16b95a2 100644 --- a/src/com/android/settings/SettingsInitialize.java +++ b/src/com/android/settings/SettingsInitialize.java @@ -16,6 +16,11 @@ package com.android.settings; +import static android.content.pm.PackageManager.GET_ACTIVITIES; +import static android.content.pm.PackageManager.GET_META_DATA; +import static android.content.pm.PackageManager.GET_RESOLVED_FILTER; +import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS; + import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -27,19 +32,15 @@ import android.content.pm.ShortcutManager; import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; import android.util.Log; -import java.util.ArrayList; -import java.util.List; - -import static android.content.pm.PackageManager.GET_ACTIVITIES; -import static android.content.pm.PackageManager.GET_META_DATA; -import static android.content.pm.PackageManager.GET_RESOLVED_FILTER; -import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS; +import androidx.annotation.VisibleForTesting; import com.android.settings.shortcut.CreateShortcut; +import java.util.ArrayList; +import java.util.List; + /** * Listens to {@link Intent.ACTION_PRE_BOOT_COMPLETED} and {@link Intent.ACTION_USER_INITIALIZED} * performs setup steps for a managed profile (disables the launcher icon of the Settings app, diff --git a/src/com/android/settings/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java index c1489b03372..8399f6420ff 100644 --- a/src/com/android/settings/SettingsLicenseActivity.java +++ b/src/com/android/settings/SettingsLicenseActivity.java @@ -25,12 +25,13 @@ import android.content.Loader; import android.net.Uri; import android.os.Bundle; import android.os.SystemProperties; -import androidx.annotation.VisibleForTesting; -import androidx.core.content.FileProvider; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; +import androidx.core.content.FileProvider; + import com.android.settings.users.RestrictedProfileSettings; import com.android.settingslib.license.LicenseHtmlLoader; diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java index e5a4892044f..70b96c4414b 100644 --- a/src/com/android/settings/SettingsPreferenceFragment.java +++ b/src/com/android/settings/SettingsPreferenceFragment.java @@ -26,13 +26,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; -import androidx.annotation.XmlRes; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.ArrayMap; import android.util.Log; @@ -41,6 +34,14 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import androidx.annotation.VisibleForTesting; +import androidx.annotation.XmlRes; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.applications.LayoutPreference; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/SetupRedactionInterstitial.java b/src/com/android/settings/SetupRedactionInterstitial.java index ac1db15bdc8..90f6c21dab7 100644 --- a/src/com/android/settings/SetupRedactionInterstitial.java +++ b/src/com/android/settings/SetupRedactionInterstitial.java @@ -20,7 +20,6 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import android.content.res.Resources; import com.android.settings.notification.RedactionInterstitial; diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java index e449d52813d..27cdb691d2b 100644 --- a/src/com/android/settings/SetupWizardUtils.java +++ b/src/com/android/settings/SetupWizardUtils.java @@ -18,6 +18,7 @@ package com.android.settings; import android.content.Intent; import android.os.SystemProperties; + import androidx.annotation.VisibleForTesting; import com.android.setupwizardlib.util.WizardManagerHelper; diff --git a/src/com/android/settings/SummaryPreference.java b/src/com/android/settings/SummaryPreference.java index 88230278647..ced5cd75621 100644 --- a/src/com/android/settings/SummaryPreference.java +++ b/src/com/android/settings/SummaryPreference.java @@ -15,14 +15,15 @@ package com.android.settings; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + /** * Provides a summary of a setting page in a preference. Such as memory or data usage. */ diff --git a/src/com/android/settings/TestingSettings.java b/src/com/android/settings/TestingSettings.java index b630685cf52..ff58f11ede9 100644 --- a/src/com/android/settings/TestingSettings.java +++ b/src/com/android/settings/TestingSettings.java @@ -18,6 +18,7 @@ package com.android.settings; import android.os.Bundle; import android.os.UserManager; + import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/TestingSettingsBroadcastReceiver.java b/src/com/android/settings/TestingSettingsBroadcastReceiver.java index a66f2089962..2172cd07d60 100644 --- a/src/com/android/settings/TestingSettingsBroadcastReceiver.java +++ b/src/com/android/settings/TestingSettingsBroadcastReceiver.java @@ -1,11 +1,11 @@ package com.android.settings; +import static com.android.internal.telephony.TelephonyIntents.SECRET_CODE_ACTION; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import static com.android.internal.telephony.TelephonyIntents.SECRET_CODE_ACTION; - import com.android.settings.Settings.TestingSettingsActivity; diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java index e7dc952309c..19f0ab06b28 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -34,8 +34,9 @@ import android.os.Bundle; import android.os.Environment; import android.os.Handler; import android.os.UserManager; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.datausage.DataSaverBackend; diff --git a/src/com/android/settings/TimeoutListPreference.java b/src/com/android/settings/TimeoutListPreference.java index 4b0fd9d0451..a0e59068f5f 100644 --- a/src/com/android/settings/TimeoutListPreference.java +++ b/src/com/android/settings/TimeoutListPreference.java @@ -16,6 +16,8 @@ package com.android.settings; +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + import android.app.AlertDialog; import android.app.Dialog; import android.app.admin.DevicePolicyManager; @@ -28,8 +30,6 @@ import com.android.settingslib.RestrictedLockUtils; import java.util.ArrayList; -import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - public class TimeoutListPreference extends RestrictedListPreference { private EnforcedAdmin mAdmin; private final CharSequence[] mInitialEntries; diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java index 86340be98f6..ff217f6be9c 100644 --- a/src/com/android/settings/TrustedCredentialsSettings.java +++ b/src/com/android/settings/TrustedCredentialsSettings.java @@ -42,9 +42,9 @@ import android.os.UserManager; import android.security.IKeyChainService; import android.security.KeyChain; import android.security.KeyChain.KeyChainConnection; +import android.util.ArraySet; import android.util.Log; import android.util.SparseArray; -import android.util.ArraySet; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/com/android/settings/UserCredentialsSettings.java b/src/com/android/settings/UserCredentialsSettings.java index 571a32c41ea..ada3fa52e98 100644 --- a/src/com/android/settings/UserCredentialsSettings.java +++ b/src/com/android/settings/UserCredentialsSettings.java @@ -39,7 +39,6 @@ import android.security.KeyChain.KeyChainConnection; import android.security.KeyStore; import android.security.keymaster.KeyCharacteristics; import android.security.keymaster.KeymasterDefs; -import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.util.SparseArray; import android.view.LayoutInflater; @@ -47,11 +46,14 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +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; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + import java.security.UnrecoverableKeyException; import java.util.ArrayList; import java.util.EnumSet; diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index 938f5b7b316..04b7843e928 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -71,9 +71,6 @@ import android.provider.ContactsContract.Data; import android.provider.ContactsContract.Profile; import android.provider.ContactsContract.RawContacts; import android.provider.Settings; -import androidx.annotation.StringRes; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; import android.telephony.TelephonyManager; import android.text.Spannable; import android.text.SpannableString; @@ -90,6 +87,10 @@ import android.widget.EditText; import android.widget.ListView; import android.widget.TabWidget; +import androidx.annotation.StringRes; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + import com.android.internal.app.UnlaunchableAppActivity; import com.android.internal.util.ArrayUtils; import com.android.internal.widget.LockPatternUtils; diff --git a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java index c1c8a64c508..4890011d2ff 100644 --- a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java +++ b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java @@ -16,6 +16,8 @@ package com.android.settings.accessibility; +import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; + import android.accessibilityservice.AccessibilityServiceInfo; import android.app.Activity; import android.app.AlertDialog; @@ -39,8 +41,6 @@ import com.android.settings.R; import java.util.List; import java.util.Locale; -import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; - /** * Utility class for creating the dialog that asks users for explicit permission to grant * all of the requested capabilities to an accessibility service before the service is enabled diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index d9479bbd74a..88e709a6cc5 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -33,18 +33,19 @@ import android.os.UserHandle; import android.os.Vibrator; import android.provider.SearchIndexableResource; import android.provider.Settings; +import android.text.TextUtils; +import android.util.ArrayMap; +import android.view.KeyCharacterMap; +import android.view.KeyEvent; +import android.view.accessibility.AccessibilityManager; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.core.content.ContextCompat; import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; -import android.util.ArrayMap; -import android.view.KeyCharacterMap; -import android.view.KeyEvent; -import android.view.accessibility.AccessibilityManager; +import androidx.preference.SwitchPreference; import com.android.internal.accessibility.AccessibilityShortcutController; import com.android.internal.content.PackageMonitor; diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java index 3500ba29d5e..9ee155f97b7 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java @@ -21,10 +21,11 @@ import android.content.ComponentName; import android.content.Context; import android.content.pm.ServiceInfo; import android.os.Bundle; -import androidx.preference.Preference; import android.text.TextUtils; 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; diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java index 37b1018ffe4..598e94cbf0d 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java @@ -17,11 +17,12 @@ package com.android.settings.accessibility; import android.os.Bundle; -import androidx.preference.PreferenceFragment; -import androidx.preference.Preference; import android.view.Menu; import android.view.accessibility.AccessibilityEvent; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; + import com.android.settings.SettingsActivity; import com.android.settings.core.SubSettingLauncher; import com.android.settings.search.actionbar.SearchMenuController; diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java index e9321c67b43..69910bd33da 100644 --- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java @@ -25,11 +25,12 @@ import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.view.accessibility.AccessibilityManager; import android.widget.Switch; +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; diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java index a5e02c5cc57..33cb95ec319 100644 --- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java +++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java @@ -23,10 +23,6 @@ import android.graphics.Color; import android.os.Bundle; import android.preference.PreferenceFrameLayout; import android.provider.Settings; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceCategory; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnLayoutChangeListener; @@ -35,6 +31,11 @@ import android.view.ViewGroup.LayoutParams; import android.view.accessibility.CaptioningManager; import android.view.accessibility.CaptioningManager.CaptionStyle; +import androidx.preference.ListPreference; +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; diff --git a/src/com/android/settings/accessibility/ColorPreference.java b/src/com/android/settings/accessibility/ColorPreference.java index 7a7b7fc6457..e360a9ebce8 100644 --- a/src/com/android/settings/accessibility/ColorPreference.java +++ b/src/com/android/settings/accessibility/ColorPreference.java @@ -20,13 +20,14 @@ import android.content.Context; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; /** diff --git a/src/com/android/settings/accessibility/DividerAllowedBelowPreference.java b/src/com/android/settings/accessibility/DividerAllowedBelowPreference.java index 53a2dda5b26..1be281f614b 100644 --- a/src/com/android/settings/accessibility/DividerAllowedBelowPreference.java +++ b/src/com/android/settings/accessibility/DividerAllowedBelowPreference.java @@ -17,9 +17,10 @@ package com.android.settings.accessibility; import android.content.Context; +import android.util.AttributeSet; + import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; -import android.util.AttributeSet; /* * Preference that always has a divider below. Used for SUW Accessibility Settings Summary text. diff --git a/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceController.java b/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceController.java index 090c3de1e9a..343ebb14074 100644 --- a/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceController.java +++ b/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.accessibility; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; public class HapticFeedbackIntensityPreferenceController diff --git a/src/com/android/settings/accessibility/LocalePreference.java b/src/com/android/settings/accessibility/LocalePreference.java index 4d3497d73fe..a3723fd4eab 100644 --- a/src/com/android/settings/accessibility/LocalePreference.java +++ b/src/com/android/settings/accessibility/LocalePreference.java @@ -17,9 +17,10 @@ package com.android.settings.accessibility; import android.content.Context; -import androidx.preference.ListPreference; import android.util.AttributeSet; +import androidx.preference.ListPreference; + import com.android.internal.app.LocalePicker; import com.android.settings.R; diff --git a/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java b/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java index 16c354c3018..f613c69e1b5 100644 --- a/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java +++ b/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java @@ -16,9 +16,10 @@ package com.android.settings.accessibility; import android.content.Context; import android.os.Bundle; import android.provider.Settings; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; diff --git a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java b/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java index ff12e27ff60..5af5d930561 100644 --- a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java +++ b/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java @@ -16,9 +16,10 @@ package com.android.settings.accessibility; import android.content.Context; import android.os.Bundle; import android.provider.Settings; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; diff --git a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java index e6875e479b3..1b20ec63037 100644 --- a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java @@ -24,11 +24,12 @@ import android.content.res.Resources; import android.os.Bundle; import android.provider.SearchIndexableResource; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import android.text.TextUtils; 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; diff --git a/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceController.java b/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceController.java index 362b59cffc7..4aff5139233 100644 --- a/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceController.java +++ b/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.accessibility; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; public class NotificationVibrationIntensityPreferenceController diff --git a/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java b/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java index 5f43c2d346f..6804abcb78a 100644 --- a/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java @@ -17,7 +17,6 @@ package com.android.settings.accessibility; import android.media.AudioAttributes; import android.os.Vibrator; -import android.os.VibrationEffect; import android.provider.Settings; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java index a8a960f7671..e3be4a96d2e 100644 --- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java +++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java @@ -16,8 +16,11 @@ 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.Activity; @@ -39,8 +42,9 @@ import android.text.TextUtils; import android.view.accessibility.AccessibilityManager; 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; diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java index 53f7fb51ccf..b345e05e9cc 100644 --- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java @@ -26,10 +26,8 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.pm.ResolveInfo; import android.net.Uri; -import android.os.Binder; import android.os.Bundle; import android.os.Handler; -import android.os.IBinder; import android.os.UserHandle; import android.os.storage.StorageManager; import android.provider.Settings; diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java index 3f0fe0ce3cd..fb6286279ad 100644 --- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java @@ -19,10 +19,11 @@ package com.android.settings.accessibility; import android.content.res.Resources; import android.os.Bundle; import android.provider.Settings; -import androidx.preference.Preference; import android.view.accessibility.AccessibilityManager; 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.widget.SeekBarPreference; diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java index a38fd275377..15714527244 100644 --- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java @@ -18,11 +18,12 @@ package com.android.settings.accessibility; import android.os.Bundle; import android.provider.Settings; -import androidx.preference.ListPreference; -import androidx.preference.Preference; import android.view.accessibility.AccessibilityManager; 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.widget.SwitchBar; diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java index 94a26b9d5a8..fba5ddb3112 100644 --- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java @@ -19,9 +19,10 @@ package com.android.settings.accessibility; import android.content.Intent; import android.content.pm.ResolveInfo; import android.os.Bundle; +import android.view.View; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.view.View; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java index 8c15e5ba63a..45b9def55e8 100644 --- a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java @@ -22,6 +22,7 @@ import android.content.res.Configuration; 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.PreviewSeekBarPreferenceFragment; import com.android.settings.R; diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java index 3e5af894a80..99ed7a1494f 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java @@ -25,9 +25,6 @@ import android.media.MediaPlayer; import android.media.MediaPlayer.OnPreparedListener; import android.net.Uri; import android.os.Bundle; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.PreferenceViewHolder; import android.view.Display; import android.view.ViewTreeObserver.OnGlobalLayoutListener; import android.view.WindowManager; @@ -36,6 +33,10 @@ import android.widget.RelativeLayout.LayoutParams; import android.widget.Switch; import android.widget.VideoView; +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; diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java index 43381728676..48a05694c3a 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java @@ -18,7 +18,6 @@ package com.android.settings.accessibility; import android.os.Bundle; -import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard diff --git a/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java b/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java index 1d2012452a6..ba08a4313fd 100644 --- a/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java @@ -15,10 +15,8 @@ */ package com.android.settings.accessibility; -import android.graphics.drawable.Drawable; import android.media.AudioAttributes; import android.os.Vibrator; -import android.os.VibrationEffect; import android.provider.Settings; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java b/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java index ef7753513a0..d9b1d7935d2 100644 --- a/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java +++ b/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java @@ -23,6 +23,7 @@ import android.os.Handler; import android.os.Looper; import android.os.Vibrator; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/accessibility/VibrationPreferenceFragment.java b/src/com/android/settings/accessibility/VibrationPreferenceFragment.java index 99557836aa0..1101611a845 100644 --- a/src/com/android/settings/accessibility/VibrationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/VibrationPreferenceFragment.java @@ -17,7 +17,6 @@ package com.android.settings.accessibility; import static android.os.Vibrator.VibrationIntensity; -import androidx.annotation.VisibleForTesting; import android.content.Context; import android.database.ContentObserver; import android.graphics.drawable.Drawable; @@ -30,8 +29,8 @@ import android.provider.Settings; import android.util.ArrayMap; import android.util.Log; -import com.android.internal.accessibility.AccessibilityShortcutController; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settingslib.widget.CandidateInfo; diff --git a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java index 241f1f3e043..f9b7201ef29 100644 --- a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java +++ b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java @@ -21,6 +21,7 @@ import android.content.Context; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/accounts/AccountHeaderPreferenceController.java b/src/com/android/settings/accounts/AccountHeaderPreferenceController.java index 78713469c0b..e9476b39b74 100644 --- a/src/com/android/settings/accounts/AccountHeaderPreferenceController.java +++ b/src/com/android/settings/accounts/AccountHeaderPreferenceController.java @@ -24,6 +24,7 @@ import android.app.Activity; import android.content.Context; import android.os.Bundle; import android.os.UserHandle; + import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/accounts/AccountPreference.java b/src/com/android/settings/accounts/AccountPreference.java index ad7a4b380e4..eea31131256 100644 --- a/src/com/android/settings/accounts/AccountPreference.java +++ b/src/com/android/settings/accounts/AccountPreference.java @@ -19,11 +19,12 @@ package com.android.settings.accounts; import android.accounts.Account; import android.content.Context; import android.graphics.drawable.Drawable; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.util.Log; import android.widget.ImageView; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import java.util.ArrayList; diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java index fad2f13fafd..ece99559456 100644 --- a/src/com/android/settings/accounts/AccountPreferenceController.java +++ b/src/com/android/settings/accounts/AccountPreferenceController.java @@ -36,15 +36,16 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; import android.text.BidiFormatter; import android.util.ArrayMap; import android.util.Log; import android.util.SparseArray; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.internal.annotations.VisibleForTesting; import com.android.settings.AccessiblePreferenceCategory; import com.android.settings.R; diff --git a/src/com/android/settings/accounts/AccountRestrictionHelper.java b/src/com/android/settings/accounts/AccountRestrictionHelper.java index 43c56ba9c49..5fa83b38ef0 100644 --- a/src/com/android/settings/accounts/AccountRestrictionHelper.java +++ b/src/com/android/settings/accounts/AccountRestrictionHelper.java @@ -17,9 +17,11 @@ package com.android.settings.accounts; import android.annotation.UserIdInt; import android.content.Context; + import com.android.settings.AccessiblePreferenceCategory; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreference; + import java.util.ArrayList; public class AccountRestrictionHelper { diff --git a/src/com/android/settings/accounts/AccountSyncPreferenceController.java b/src/com/android/settings/accounts/AccountSyncPreferenceController.java index a0c30ac9c7a..34d903522c4 100644 --- a/src/com/android/settings/accounts/AccountSyncPreferenceController.java +++ b/src/com/android/settings/accounts/AccountSyncPreferenceController.java @@ -24,6 +24,7 @@ import android.content.Context; import android.content.SyncAdapterType; import android.os.Bundle; import android.os.UserHandle; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java index 11867c2b10e..5b5cf828c73 100644 --- a/src/com/android/settings/accounts/AccountSyncSettings.java +++ b/src/com/android/settings/accounts/AccountSyncSettings.java @@ -35,7 +35,6 @@ import android.os.Binder; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -47,6 +46,8 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/accounts/AccountTypePreference.java b/src/com/android/settings/accounts/AccountTypePreference.java index 66f8888ecf7..a452f8d5c32 100644 --- a/src/com/android/settings/accounts/AccountTypePreference.java +++ b/src/com/android/settings/accounts/AccountTypePreference.java @@ -24,6 +24,7 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; diff --git a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java index e811388066b..e5e40c3b9b6 100644 --- a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java +++ b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java @@ -29,13 +29,14 @@ import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.content.res.Resources.Theme; import android.os.UserHandle; -import androidx.preference.PreferenceFragment; +import android.text.TextUtils; +import android.util.Log; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; -import android.util.Log; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; diff --git a/src/com/android/settings/accounts/ChooseAccountActivity.java b/src/com/android/settings/accounts/ChooseAccountActivity.java index 35f51afa80d..a10ea03c048 100644 --- a/src/com/android/settings/accounts/ChooseAccountActivity.java +++ b/src/com/android/settings/accounts/ChooseAccountActivity.java @@ -33,9 +33,10 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; +import android.util.Log; + import androidx.preference.Preference; import androidx.preference.PreferenceGroup; -import android.util.Log; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.CharSequences; @@ -47,7 +48,6 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.widget.FooterPreference; -import com.android.settingslib.widget.FooterPreferenceMixin; import com.google.android.collect.Maps; diff --git a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java index 95bc8e7d3cc..31e5613541c 100644 --- a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java +++ b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java @@ -22,6 +22,7 @@ import android.content.pm.UserInfo; import android.content.res.Resources; import android.os.UserHandle; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/accounts/ManagedProfileSettings.java b/src/com/android/settings/accounts/ManagedProfileSettings.java index 4227e6dec77..694b8af24e4 100644 --- a/src/com/android/settings/accounts/ManagedProfileSettings.java +++ b/src/com/android/settings/accounts/ManagedProfileSettings.java @@ -16,6 +16,8 @@ package com.android.settings.accounts; +import static android.provider.Settings.Secure.MANAGED_PROFILE_CONTACT_REMOTE_SEARCH; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -24,10 +26,11 @@ import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -35,8 +38,6 @@ import com.android.settings.Utils; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; -import static android.provider.Settings.Secure.MANAGED_PROFILE_CONTACT_REMOTE_SEARCH; - /** * Setting page for managed profile. * FIXME: It currently assumes there is only one managed profile. diff --git a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java index ecb849bb8ac..fbeb90dcddb 100644 --- a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java +++ b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java @@ -31,11 +31,12 @@ import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.PreferenceScreen; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/accounts/SyncStateSwitchPreference.java b/src/com/android/settings/accounts/SyncStateSwitchPreference.java index b65b1838116..9c7f739a68a 100644 --- a/src/com/android/settings/accounts/SyncStateSwitchPreference.java +++ b/src/com/android/settings/accounts/SyncStateSwitchPreference.java @@ -19,14 +19,15 @@ package com.android.settings.accounts; import android.accounts.Account; import android.app.ActivityManager; import android.content.Context; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; import android.view.View; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; +import androidx.preference.SwitchPreference; + import com.android.settings.R; import com.android.settingslib.widget.AnimatedImageView; diff --git a/src/com/android/settings/applications/AppInfoWithHeader.java b/src/com/android/settings/applications/AppInfoWithHeader.java index dd71087a2a0..8a147c17d2b 100644 --- a/src/com/android/settings/applications/AppInfoWithHeader.java +++ b/src/com/android/settings/applications/AppInfoWithHeader.java @@ -20,10 +20,11 @@ import static com.android.settings.widget.EntityHeaderController.ActionType; import android.app.Activity; import android.os.Bundle; -import androidx.preference.Preference; import android.util.IconDrawableFactory; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.applications.AppUtils; diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java index 7d422b15030..7d11ff95afa 100644 --- a/src/com/android/settings/applications/AppLaunchSettings.java +++ b/src/com/android/settings/applications/AppLaunchSettings.java @@ -16,6 +16,11 @@ 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.AlertDialog; import android.content.Intent; import android.content.IntentFilter; @@ -26,25 +31,21 @@ import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Bundle; import android.os.UserHandle; -import androidx.preference.DropDownPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; import android.util.ArraySet; import android.util.Log; import android.view.View; import android.view.View.OnClickListener; +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; import java.util.List; -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; - public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListener, Preference.OnPreferenceChangeListener { private static final String TAG = "AppLaunchSettings"; diff --git a/src/com/android/settings/applications/AppStateAppOpsBridge.java b/src/com/android/settings/applications/AppStateAppOpsBridge.java index f8dd59ce8e5..0e3ee2d8116 100755 --- a/src/com/android/settings/applications/AppStateAppOpsBridge.java +++ b/src/com/android/settings/applications/AppStateAppOpsBridge.java @@ -25,11 +25,12 @@ import android.content.pm.PackageManager; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; import android.util.ArrayMap; import android.util.Log; import android.util.SparseArray; +import androidx.annotation.VisibleForTesting; + import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; diff --git a/src/com/android/settings/applications/AppStateInstallAppsBridge.java b/src/com/android/settings/applications/AppStateInstallAppsBridge.java index 5b9ded648cf..f852bcab9a0 100644 --- a/src/com/android/settings/applications/AppStateInstallAppsBridge.java +++ b/src/com/android/settings/applications/AppStateInstallAppsBridge.java @@ -25,7 +25,6 @@ import android.os.RemoteException; import android.util.Log; import com.android.internal.util.ArrayUtils; -import com.android.settings.R; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.ApplicationsState.AppFilter; diff --git a/src/com/android/settings/applications/AppStateNotificationBridge.java b/src/com/android/settings/applications/AppStateNotificationBridge.java index 6cf64c3e57b..205c92d091a 100644 --- a/src/com/android/settings/applications/AppStateNotificationBridge.java +++ b/src/com/android/settings/applications/AppStateNotificationBridge.java @@ -17,7 +17,6 @@ package com.android.settings.applications; import android.app.usage.IUsageStatsManager; import android.app.usage.UsageEvents; -import android.app.usage.UsageStatsManager; import android.content.Context; import android.os.RemoteException; import android.os.UserHandle; diff --git a/src/com/android/settings/applications/AppStateSmsPremBridge.java b/src/com/android/settings/applications/AppStateSmsPremBridge.java index 0fa7e50ff66..5a79a62bb9b 100644 --- a/src/com/android/settings/applications/AppStateSmsPremBridge.java +++ b/src/com/android/settings/applications/AppStateSmsPremBridge.java @@ -16,6 +16,7 @@ package com.android.settings.applications; import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; + import com.android.internal.telephony.ISms; import com.android.internal.telephony.SmsUsageMonitor; import com.android.settingslib.applications.ApplicationsState; diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java index 82891143527..f99bcc04860 100644 --- a/src/com/android/settings/applications/AppStorageSettings.java +++ b/src/com/android/settings/applications/AppStorageSettings.java @@ -19,18 +19,14 @@ package com.android.settings.applications; import static android.content.pm.ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA; import static android.content.pm.ApplicationInfo.FLAG_SYSTEM; import static android.os.storage.StorageVolume.ScopedAccessProviderContract.AUTHORITY; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract.COL_GRANTED; import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS; -import static com.android.settings.applications.AppStateDirectoryAccessBridge.DEBUG; - import android.app.ActivityManager; import android.app.AlertDialog; import android.app.AppGlobals; import android.app.GrantedUriPermission; import android.app.LoaderManager; import android.content.ContentResolver; -import android.content.ContentValues; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -47,15 +43,16 @@ import android.os.RemoteException; import android.os.UserHandle; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; import android.util.Log; import android.util.MutableInt; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; +import androidx.annotation.VisibleForTesting; +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; diff --git a/src/com/android/settings/applications/AppStorageSizesController.java b/src/com/android/settings/applications/AppStorageSizesController.java index 6999a1581e2..43734b272c4 100644 --- a/src/com/android/settings/applications/AppStorageSizesController.java +++ b/src/com/android/settings/applications/AppStorageSizesController.java @@ -17,10 +17,11 @@ package com.android.settings.applications; import android.content.Context; +import android.text.format.Formatter; + import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.preference.Preference; -import android.text.format.Formatter; import com.android.internal.util.Preconditions; import com.android.settingslib.applications.StorageStatsSource; diff --git a/src/com/android/settings/applications/ClearDefaultsPreference.java b/src/com/android/settings/applications/ClearDefaultsPreference.java index 26eb0844ce6..768fb4ea99c 100644 --- a/src/com/android/settings/applications/ClearDefaultsPreference.java +++ b/src/com/android/settings/applications/ClearDefaultsPreference.java @@ -24,9 +24,6 @@ import android.os.IBinder; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.SpannableString; import android.text.TextUtils; import android.text.style.BulletSpan; @@ -36,6 +33,10 @@ import android.view.View; import android.widget.Button; import android.widget.TextView; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState; diff --git a/src/com/android/settings/applications/ConfirmConvertToFbe.java b/src/com/android/settings/applications/ConfirmConvertToFbe.java index 1a4421e2304..5570f97144f 100644 --- a/src/com/android/settings/applications/ConfirmConvertToFbe.java +++ b/src/com/android/settings/applications/ConfirmConvertToFbe.java @@ -15,7 +15,6 @@ */ package com.android.settings.applications; -import android.app.Fragment; import android.content.Intent; import android.os.Bundle; import android.view.LayoutInflater; diff --git a/src/com/android/settings/applications/DataSaverController.java b/src/com/android/settings/applications/DataSaverController.java index afe7cd64cd3..c2e79bbc6a0 100644 --- a/src/com/android/settings/applications/DataSaverController.java +++ b/src/com/android/settings/applications/DataSaverController.java @@ -18,10 +18,11 @@ package com.android.settings.applications; import android.content.Context; + import androidx.annotation.VisibleForTesting; -import com.android.settings.core.BasePreferenceController; import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; public class DataSaverController extends BasePreferenceController { diff --git a/src/com/android/settings/applications/DeviceAdministratorsController.java b/src/com/android/settings/applications/DeviceAdministratorsController.java index ec1d556a611..6b942d6b3a8 100644 --- a/src/com/android/settings/applications/DeviceAdministratorsController.java +++ b/src/com/android/settings/applications/DeviceAdministratorsController.java @@ -17,10 +17,11 @@ package com.android.settings.applications; import android.content.Context; + import androidx.annotation.VisibleForTesting; -import com.android.settings.core.BasePreferenceController; import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; public class DeviceAdministratorsController extends BasePreferenceController { diff --git a/src/com/android/settings/applications/DirectoryAccessDetails.java b/src/com/android/settings/applications/DirectoryAccessDetails.java index 8a8fa98b652..47c36c296ff 100644 --- a/src/com/android/settings/applications/DirectoryAccessDetails.java +++ b/src/com/android/settings/applications/DirectoryAccessDetails.java @@ -17,16 +17,18 @@ package com.android.settings.applications; import static android.os.storage.StorageVolume.ScopedAccessProviderContract.AUTHORITY; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract.COL_DIRECTORY; import static android.os.storage.StorageVolume.ScopedAccessProviderContract.COL_GRANTED; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract.COL_PACKAGE; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract.COL_VOLUME_UUID; import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COLUMNS; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COL_DIRECTORY; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COL_GRANTED; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COL_PACKAGE; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COL_VOLUME_UUID; +import static android.os.storage.StorageVolume.ScopedAccessProviderContract + .TABLE_PERMISSIONS_COLUMNS; +import static android.os.storage.StorageVolume.ScopedAccessProviderContract + .TABLE_PERMISSIONS_COL_DIRECTORY; +import static android.os.storage.StorageVolume.ScopedAccessProviderContract + .TABLE_PERMISSIONS_COL_GRANTED; +import static android.os.storage.StorageVolume.ScopedAccessProviderContract + .TABLE_PERMISSIONS_COL_PACKAGE; +import static android.os.storage.StorageVolume.ScopedAccessProviderContract + .TABLE_PERMISSIONS_COL_VOLUME_UUID; import static com.android.settings.applications.AppStateDirectoryAccessBridge.DEBUG; import static com.android.settings.applications.AppStateDirectoryAccessBridge.VERBOSE; @@ -42,21 +44,15 @@ import android.net.Uri; import android.os.Bundle; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroupAdapter; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceCategory; -import android.text.TextUtils; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; -import android.util.ArrayMap; -import android.util.ArraySet; import android.util.IconDrawableFactory; import android.util.Log; import android.util.Pair; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +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.widget.EntityHeaderController; diff --git a/src/com/android/settings/applications/EnabledVrListenersController.java b/src/com/android/settings/applications/EnabledVrListenersController.java index 7b33529d7eb..901e3da3a77 100644 --- a/src/com/android/settings/applications/EnabledVrListenersController.java +++ b/src/com/android/settings/applications/EnabledVrListenersController.java @@ -17,10 +17,11 @@ package com.android.settings.applications; import android.content.Context; + import androidx.annotation.VisibleForTesting; -import com.android.settings.core.BasePreferenceController; import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; public class EnabledVrListenersController extends BasePreferenceController { diff --git a/src/com/android/settings/applications/HighPowerAppsController.java b/src/com/android/settings/applications/HighPowerAppsController.java index 39b84516315..70d610083e4 100644 --- a/src/com/android/settings/applications/HighPowerAppsController.java +++ b/src/com/android/settings/applications/HighPowerAppsController.java @@ -17,10 +17,11 @@ package com.android.settings.applications; import android.content.Context; + import androidx.annotation.VisibleForTesting; -import com.android.settings.core.BasePreferenceController; import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; public class HighPowerAppsController extends BasePreferenceController { diff --git a/src/com/android/settings/applications/InstalledAppCounter.java b/src/com/android/settings/applications/InstalledAppCounter.java index 26372ee577e..54216ce5e7d 100644 --- a/src/com/android/settings/applications/InstalledAppCounter.java +++ b/src/com/android/settings/applications/InstalledAppCounter.java @@ -17,8 +17,8 @@ package com.android.settings.applications; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; -import android.content.pm.ResolveInfo; import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; import android.os.UserHandle; import com.android.settingslib.wrapper.PackageManagerWrapper; diff --git a/src/com/android/settings/applications/LayoutPreference.java b/src/com/android/settings/applications/LayoutPreference.java index f80100f9d26..cc077cc7539 100644 --- a/src/com/android/settings/applications/LayoutPreference.java +++ b/src/com/android/settings/applications/LayoutPreference.java @@ -18,16 +18,17 @@ package com.android.settings.applications; import android.content.Context; import android.content.res.TypedArray; -import androidx.annotation.VisibleForTesting; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; +import androidx.annotation.VisibleForTesting; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/applications/ManageDomainUrls.java b/src/com/android/settings/applications/ManageDomainUrls.java index 1b9dbaf64cd..78a7b2d65e6 100644 --- a/src/com/android/settings/applications/ManageDomainUrls.java +++ b/src/com/android/settings/applications/ManageDomainUrls.java @@ -23,16 +23,17 @@ import android.os.Bundle; import android.os.UserHandle; import android.provider.Settings; import android.provider.Settings.Global; +import android.util.ArraySet; +import android.view.View; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceViewHolder; -import android.util.ArraySet; -import android.view.View; +import androidx.preference.SwitchPreference; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/applications/PremiumSmsAccess.java b/src/com/android/settings/applications/PremiumSmsAccess.java index 2210c0b176b..e9259dbeebb 100644 --- a/src/com/android/settings/applications/PremiumSmsAccess.java +++ b/src/com/android/settings/applications/PremiumSmsAccess.java @@ -18,12 +18,13 @@ import android.annotation.Nullable; import android.app.Application; import android.content.Context; import android.os.Bundle; +import android.view.View; + import androidx.preference.DropDownPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceViewHolder; -import android.view.View; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/applications/PremiumSmsController.java b/src/com/android/settings/applications/PremiumSmsController.java index eeb5d86fd90..5ac374f7162 100644 --- a/src/com/android/settings/applications/PremiumSmsController.java +++ b/src/com/android/settings/applications/PremiumSmsController.java @@ -17,10 +17,11 @@ package com.android.settings.applications; import android.content.Context; + import androidx.annotation.VisibleForTesting; -import com.android.settings.core.BasePreferenceController; import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; public class PremiumSmsController extends BasePreferenceController { diff --git a/src/com/android/settings/applications/ProcStatsPackageEntry.java b/src/com/android/settings/applications/ProcStatsPackageEntry.java index 88d5bd645eb..0c4f9be82b9 100644 --- a/src/com/android/settings/applications/ProcStatsPackageEntry.java +++ b/src/com/android/settings/applications/ProcStatsPackageEntry.java @@ -21,8 +21,8 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Parcel; import android.os.Parcelable; - import android.util.Log; + import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java index 75609528d8e..dda5063e8b9 100644 --- a/src/com/android/settings/applications/ProcessStatsDetail.java +++ b/src/com/android/settings/applications/ProcessStatsDetail.java @@ -16,6 +16,8 @@ package com.android.settings.applications; +import static com.android.settings.widget.EntityHeaderController.ActionType; + import android.app.Activity; import android.app.ActivityManager; import android.app.ActivityManager.RunningServiceInfo; @@ -33,8 +35,6 @@ import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.os.Process; import android.os.UserHandle; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; import android.text.format.Formatter; import android.util.ArrayMap; import android.util.IconDrawableFactory; @@ -44,6 +44,9 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; +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; @@ -59,8 +62,6 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; -import static com.android.settings.widget.EntityHeaderController.ActionType; - public class ProcessStatsDetail extends SettingsPreferenceFragment { private static final String TAG = "ProcessStatsDetail"; diff --git a/src/com/android/settings/applications/ProcessStatsPreference.java b/src/com/android/settings/applications/ProcessStatsPreference.java index 034a68dd69b..64521984fc7 100644 --- a/src/com/android/settings/applications/ProcessStatsPreference.java +++ b/src/com/android/settings/applications/ProcessStatsPreference.java @@ -20,8 +20,8 @@ import android.content.Context; import android.content.pm.PackageManager; import android.text.TextUtils; import android.text.format.Formatter; - import android.util.Log; + import com.android.settings.widget.AppPreference; public class ProcessStatsPreference extends AppPreference { diff --git a/src/com/android/settings/applications/ProcessStatsSummary.java b/src/com/android/settings/applications/ProcessStatsSummary.java index 72572db83a7..b29b2736936 100644 --- a/src/com/android/settings/applications/ProcessStatsSummary.java +++ b/src/com/android/settings/applications/ProcessStatsSummary.java @@ -18,11 +18,12 @@ package com.android.settings.applications; import android.app.Activity; import android.content.Context; import android.os.Bundle; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; import android.text.format.Formatter; 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; diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java index 42475d295f8..25f9c7eec5b 100644 --- a/src/com/android/settings/applications/ProcessStatsUi.java +++ b/src/com/android/settings/applications/ProcessStatsUi.java @@ -19,14 +19,15 @@ package com.android.settings.applications; import android.content.Context; import android.content.pm.PackageManager; import android.os.Bundle; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; import android.util.Log; import android.util.TimeUtils; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +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; diff --git a/src/com/android/settings/applications/RecentAppsPreferenceController.java b/src/com/android/settings/applications/RecentAppsPreferenceController.java index 92d8af1f096..628b3b1aa38 100644 --- a/src/com/android/settings/applications/RecentAppsPreferenceController.java +++ b/src/com/android/settings/applications/RecentAppsPreferenceController.java @@ -27,16 +27,17 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.os.UserHandle; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.ArrayMap; import android.util.ArraySet; import android.util.IconDrawableFactory; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/applications/SpacePreference.java b/src/com/android/settings/applications/SpacePreference.java index b532896f100..6575ad1dfa7 100644 --- a/src/com/android/settings/applications/SpacePreference.java +++ b/src/com/android/settings/applications/SpacePreference.java @@ -17,11 +17,13 @@ package com.android.settings.applications; import android.content.Context; import android.content.res.TypedArray; +import android.util.AttributeSet; +import android.view.ViewGroup.LayoutParams; + import androidx.core.content.res.TypedArrayUtils; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; -import android.util.AttributeSet; -import android.view.ViewGroup.LayoutParams; + import com.android.settings.R; /** diff --git a/src/com/android/settings/applications/SpecialAccessSettings.java b/src/com/android/settings/applications/SpecialAccessSettings.java index 16fb4057e15..81b48056515 100644 --- a/src/com/android/settings/applications/SpecialAccessSettings.java +++ b/src/com/android/settings/applications/SpecialAccessSettings.java @@ -17,15 +17,18 @@ package com.android.settings.applications; import android.app.ActivityManager; import android.content.Context; import android.os.Bundle; -import androidx.annotation.NonNull; import android.provider.SearchIndexableResource; + +import androidx.annotation.NonNull; 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 java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java index ef2b2118d3f..e5d7deec9df 100644 --- a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java +++ b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java @@ -14,7 +14,9 @@ package com.android.settings.applications; import android.content.Context; + import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.datausage.DataSaverBackend; diff --git a/src/com/android/settings/applications/UsageAccessDetails.java b/src/com/android/settings/applications/UsageAccessDetails.java index 1681b1d3169..1725af84448 100644 --- a/src/com/android/settings/applications/UsageAccessDetails.java +++ b/src/com/android/settings/applications/UsageAccessDetails.java @@ -18,27 +18,24 @@ package com.android.settings.applications; import android.app.AlertDialog; import android.app.AppOpsManager; import android.app.admin.DevicePolicyManager; -import android.content.ActivityNotFoundException; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; -import android.os.UserHandle; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; -import android.util.Log; +import androidx.preference.SwitchPreference; import com.android.internal.annotations.VisibleForTesting; 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; -import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenceChangeListener, OnPreferenceClickListener { diff --git a/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceController.java b/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceController.java index 79c22248a69..8836027ec3b 100644 --- a/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceController.java @@ -33,11 +33,12 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceScreen; import android.util.Log; import android.webkit.IWebViewUpdateService; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.applications.ApplicationFeatureProvider; diff --git a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java index 55a6c9ff4f2..20eba48c80c 100644 --- a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java @@ -23,6 +23,7 @@ import android.content.pm.PackageInfo; import android.os.BatteryStats; import android.os.Bundle; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java index c572c3724ef..4e2904eb3e2 100644 --- a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java @@ -25,11 +25,12 @@ import android.net.NetworkTemplate; import android.os.Bundle; import android.os.RemoteException; import android.os.ServiceManager; +import android.text.format.DateUtils; +import android.text.format.Formatter; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.format.DateUtils; -import android.text.format.Formatter; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java b/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java index e37e6708209..c86117503fd 100644 --- a/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.applications.appinfo; import android.app.Activity; import android.content.Context; import android.content.pm.PackageInfo; + import androidx.preference.PreferenceScreen; import com.android.settings.R; diff --git a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java index 7ae4f2bc96b..f41c991a98c 100755 --- a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java +++ b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java @@ -39,13 +39,14 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.DeviceAdminAdd; import com.android.settings.R; diff --git a/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java index 3fc629d5a57..c495cbc50c8 100644 --- a/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java +++ b/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java @@ -18,9 +18,10 @@ package com.android.settings.applications.appinfo; import android.content.Context; import android.os.Bundle; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java b/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java index 6a1079c7a74..bf8567684ec 100644 --- a/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.applications.appinfo; import android.content.Context; import android.content.Intent; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java index e5b6eed0f59..19e8ebbb297 100644 --- a/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java @@ -20,9 +20,10 @@ import android.app.Activity; import android.content.Context; import android.content.pm.PackageInfo; import android.os.AsyncTask; +import android.text.format.Formatter; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.format.Formatter; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java index d4e7e602b69..8519893da31 100644 --- a/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java @@ -20,6 +20,7 @@ import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY; import android.content.Context; import android.os.Bundle; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java b/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java index 7e61385cb7d..7f64e3b48b1 100644 --- a/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java @@ -22,6 +22,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.hardware.usb.IUsbManager; import android.os.ServiceManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java b/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java index c5eed7b4ecf..3c07254fd2b 100644 --- a/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java @@ -21,9 +21,10 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.icu.text.ListFormatter; +import android.util.Log; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.util.Log; import com.android.settings.R; import com.android.settingslib.applications.PermissionsSummaryHelper; diff --git a/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java b/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java index 4973ee90bb1..f5ce18e0080 100644 --- a/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java @@ -21,9 +21,10 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION import android.content.Context; import android.content.Intent; import android.content.pm.ResolveInfo; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.settings.overlay.FeatureFactory; public class AppSettingPreferenceController extends AppInfoPreferenceControllerBase { diff --git a/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java b/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java index 5754dd20303..172810cae8c 100644 --- a/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java @@ -22,9 +22,10 @@ import android.content.Loader; import android.content.pm.ApplicationInfo; import android.os.Bundle; import android.os.UserHandle; +import android.text.format.Formatter; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.text.format.Formatter; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java index 7b45b67de29..e4e4d2052bd 100644 --- a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java +++ b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java @@ -17,9 +17,10 @@ package com.android.settings.applications.appinfo; import android.content.Context; import android.os.Bundle; import android.os.UserManager; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java b/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java index 9efa998727b..50de6fe0676 100644 --- a/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java +++ b/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java @@ -19,21 +19,19 @@ import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYST import android.app.AlertDialog; import android.app.AppOpsManager; -import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; -import android.os.UserHandle; import android.provider.Settings; -import androidx.preference.SwitchPreference; +import android.view.Window; +import android.view.WindowManager; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; -import android.util.Log; -import android.view.Window; -import android.view.WindowManager; +import androidx.preference.SwitchPreference; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java b/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java index df8b86298be..ec2508f107a 100644 --- a/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.applications.appinfo; import android.content.Context; import android.content.pm.PackageInfo; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java index 0c06e081773..8c83820e36b 100644 --- a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java +++ b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java @@ -24,6 +24,7 @@ import android.content.Context; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; diff --git a/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java b/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java index eb5e2ebd923..aa6e3b8da1d 100644 --- a/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java @@ -25,8 +25,6 @@ import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Bundle; import android.os.UserHandle; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.view.Menu; import android.view.MenuInflater; @@ -34,6 +32,8 @@ import android.view.MenuItem; import android.view.View; import android.widget.Button; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppStoreUtil; diff --git a/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java b/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java index c0ba33f2d08..cbb805f3554 100644 --- a/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.applications.appinfo; import android.content.Context; import android.content.pm.PackageManager; + import androidx.preference.Preference; import com.android.settings.Utils; diff --git a/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceController.java b/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceController.java index 7b98404e17b..584e12cb8a5 100644 --- a/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceController.java @@ -20,9 +20,10 @@ import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.UserHandle; +import android.util.Log; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.util.Log; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/applications/appinfo/PictureInPictureDetails.java b/src/com/android/settings/applications/appinfo/PictureInPictureDetails.java index 21b224a96ae..7f4faebbedc 100644 --- a/src/com/android/settings/applications/appinfo/PictureInPictureDetails.java +++ b/src/com/android/settings/applications/appinfo/PictureInPictureDetails.java @@ -15,13 +15,18 @@ */ package com.android.settings.applications.appinfo; +import static android.app.AppOpsManager.MODE_ALLOWED; +import static android.app.AppOpsManager.MODE_ERRORED; +import static android.app.AppOpsManager.OP_PICTURE_IN_PICTURE; + import android.app.AlertDialog; import android.app.AppOpsManager; import android.content.Context; import android.os.Bundle; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.SwitchPreference; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -29,10 +34,6 @@ import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; import com.android.settings.overlay.FeatureFactory; -import static android.app.AppOpsManager.MODE_ALLOWED; -import static android.app.AppOpsManager.MODE_ERRORED; -import static android.app.AppOpsManager.OP_PICTURE_IN_PICTURE; - public class PictureInPictureDetails extends AppInfoWithHeader implements OnPreferenceChangeListener { diff --git a/src/com/android/settings/applications/appinfo/PictureInPictureSettings.java b/src/com/android/settings/applications/appinfo/PictureInPictureSettings.java index 9d7f30a911a..419669814dc 100644 --- a/src/com/android/settings/applications/appinfo/PictureInPictureSettings.java +++ b/src/com/android/settings/applications/appinfo/PictureInPictureSettings.java @@ -27,13 +27,14 @@ import android.content.pm.UserInfo; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceScreen; import android.util.IconDrawableFactory; import android.util.Pair; import android.view.View; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceScreen; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java b/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java index 6a390770249..a4cfebfcb25 100644 --- a/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java @@ -21,10 +21,11 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java b/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java index 617154797f9..97763050dbf 100644 --- a/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java +++ b/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java @@ -17,19 +17,17 @@ package com.android.settings.applications.appinfo; import android.app.AlertDialog; import android.app.AppOpsManager; -import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; -import android.os.UserHandle; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; -import android.util.Log; +import androidx.preference.SwitchPreference; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/applications/appops/BackgroundCheckSummary.java b/src/com/android/settings/applications/appops/BackgroundCheckSummary.java index d9db9aa6c2a..b347e930695 100644 --- a/src/com/android/settings/applications/appops/BackgroundCheckSummary.java +++ b/src/com/android/settings/applications/appops/BackgroundCheckSummary.java @@ -25,8 +25,8 @@ import android.view.View; import android.view.ViewGroup; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.R; +import com.android.settings.core.InstrumentedPreferenceFragment; public class BackgroundCheckSummary extends InstrumentedPreferenceFragment { // layout inflater object used to inflate views diff --git a/src/com/android/settings/applications/assist/AssistContextPreferenceController.java b/src/com/android/settings/applications/assist/AssistContextPreferenceController.java index 2ac51e7264a..3e5c4ec5280 100644 --- a/src/com/android/settings/applications/assist/AssistContextPreferenceController.java +++ b/src/com/android/settings/applications/assist/AssistContextPreferenceController.java @@ -20,6 +20,7 @@ import android.content.Context; import android.net.Uri; import android.os.UserHandle; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java index ccdacedc5ac..a1d0ddc2c88 100644 --- a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java +++ b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java @@ -21,6 +21,7 @@ import android.content.Context; import android.net.Uri; import android.os.UserHandle; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java index 59425f392e2..59479438c25 100644 --- a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java +++ b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java @@ -20,6 +20,7 @@ import android.content.Context; import android.net.Uri; import android.os.UserHandle; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/src/com/android/settings/applications/assist/AssistSettingObserver.java b/src/com/android/settings/applications/assist/AssistSettingObserver.java index c5d028ec432..f0da694a3a8 100644 --- a/src/com/android/settings/applications/assist/AssistSettingObserver.java +++ b/src/com/android/settings/applications/assist/AssistSettingObserver.java @@ -20,6 +20,7 @@ import android.content.ContentResolver; import android.database.ContentObserver; import android.net.Uri; import android.provider.Settings; + import androidx.annotation.MainThread; import com.android.settingslib.utils.ThreadUtils; diff --git a/src/com/android/settings/applications/assist/DefaultAssistPicker.java b/src/com/android/settings/applications/assist/DefaultAssistPicker.java index d54e6d1a3fe..c5a13c5b21c 100644 --- a/src/com/android/settings/applications/assist/DefaultAssistPicker.java +++ b/src/com/android/settings/applications/assist/DefaultAssistPicker.java @@ -32,7 +32,6 @@ 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; import com.android.settingslib.widget.CandidateInfo; diff --git a/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java b/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java index 6f44ff4f70c..ccc2162f808 100644 --- a/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java +++ b/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java @@ -23,6 +23,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.service.voice.VoiceInteractionService; import android.service.voice.VoiceInteractionServiceInfo; + import androidx.annotation.VisibleForTesting; import com.android.internal.app.AssistUtils; diff --git a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java index 15433676dd1..1f8b9d1a5cc 100644 --- a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java +++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java @@ -20,9 +20,10 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.net.Uri; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.internal.app.AssistUtils; import com.android.settings.applications.defaultapps.DefaultAppPreferenceController; diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java index ec8111ba906..8d3d86bacad 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java +++ b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java @@ -23,10 +23,11 @@ import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java index 7d9989ff1ce..ffee2f7c411 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java +++ b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java @@ -30,11 +30,12 @@ import android.os.Bundle; import android.provider.Settings; import android.service.autofill.AutofillService; import android.service.autofill.AutofillServiceInfo; -import androidx.preference.Preference; import android.text.Html; import android.text.TextUtils; 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; diff --git a/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java b/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java index c243970bad0..a595e3061c8 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java +++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java @@ -17,14 +17,12 @@ package com.android.settings.applications.defaultapps; import android.content.Context; -import android.content.pm.ComponentInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; - import android.util.ArraySet; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; - import com.android.settingslib.applications.DefaultAppInfo; import java.util.ArrayList; diff --git a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java index 9d72bcf6381..e1fd57b536d 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java +++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java @@ -24,11 +24,12 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.graphics.drawable.Drawable; import android.net.Uri; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.IconDrawableFactory; import android.util.Log; +import androidx.preference.Preference; + import com.android.settingslib.applications.DefaultAppInfo; import java.util.List; diff --git a/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java index b774602aeeb..55803c50f28 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java +++ b/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.nfc.NfcAdapter; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java index ff584b57e32..2e4a640de4d 100644 --- a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java +++ b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java @@ -19,11 +19,11 @@ package com.android.settings.applications.manageapplications; import androidx.annotation.IntDef; import com.android.settings.R; +import com.android.settings.applications.AppStateDirectoryAccessBridge; import com.android.settings.applications.AppStateInstallAppsBridge; import com.android.settings.applications.AppStateNotificationBridge; import com.android.settings.applications.AppStateOverlayBridge; import com.android.settings.applications.AppStatePowerBridge; -import com.android.settings.applications.AppStateDirectoryAccessBridge; import com.android.settings.applications.AppStateUsageBridge; import com.android.settings.applications.AppStateWriteSettingsBridge; import com.android.settings.wifi.AppStateChangeWifiStateBridge; diff --git a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java index a1a4c22a4bb..021a953db33 100644 --- a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java +++ b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java @@ -19,9 +19,6 @@ package com.android.settings.applications.manageapplications; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; -import androidx.annotation.StringRes; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -31,6 +28,10 @@ import android.widget.ImageView; import android.widget.Switch; import android.widget.TextView; +import androidx.annotation.StringRes; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java index b23a9670e66..f1e15cc2bd7 100644 --- a/src/com/android/settings/applications/manageapplications/ManageApplications.java +++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java @@ -17,6 +17,7 @@ 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 @@ -42,7 +43,6 @@ import android.annotation.Nullable; import android.annotation.StringRes; import android.app.Activity; import android.app.usage.IUsageStatsManager; -import android.app.usage.UsageStatsManager; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -53,10 +53,6 @@ import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; import android.preference.PreferenceFrameLayout; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.ArraySet; import android.util.Log; @@ -72,6 +68,11 @@ import android.widget.ArrayAdapter; import android.widget.FrameLayout; import android.widget.Spinner; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; +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; diff --git a/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java b/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java index 2f33c1e3363..3036657b11a 100644 --- a/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java +++ b/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java @@ -21,10 +21,11 @@ import android.content.Context; import android.content.Intent; import android.os.UserHandle; import android.provider.DocumentsContract; -import androidx.annotation.WorkerThread; import android.text.format.Formatter; import android.util.Log; +import androidx.annotation.WorkerThread; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.applications.StorageStatsSource; diff --git a/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java b/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java index 6b7c8d6ce07..694c95c4726 100644 --- a/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java +++ b/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java @@ -20,10 +20,11 @@ import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.os.UserHandle; -import androidx.annotation.WorkerThread; import android.text.format.Formatter; import android.util.Log; +import androidx.annotation.WorkerThread; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.applications.StorageStatsSource; diff --git a/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java b/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java index 3fc3c1dbf4d..6ef45935d4a 100644 --- a/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java +++ b/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.applications.manageapplications; import android.content.Context; import android.os.Bundle; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/backup/BackupSettingsActivity.java b/src/com/android/settings/backup/BackupSettingsActivity.java index a16ab7839b5..1cc0bddaee7 100644 --- a/src/com/android/settings/backup/BackupSettingsActivity.java +++ b/src/com/android/settings/backup/BackupSettingsActivity.java @@ -23,11 +23,11 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.UserHandle; -import androidx.annotation.VisibleForTesting; import android.util.Log; -import com.android.settings.R; +import androidx.annotation.VisibleForTesting; +import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settings.search.SearchIndexableRaw; diff --git a/src/com/android/settings/backup/BackupSettingsFragment.java b/src/com/android/settings/backup/BackupSettingsFragment.java index e9bcc6fe9ec..33da8eae72a 100644 --- a/src/com/android/settings/backup/BackupSettingsFragment.java +++ b/src/com/android/settings/backup/BackupSettingsFragment.java @@ -21,7 +21,6 @@ import android.os.Bundle; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; -import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; diff --git a/src/com/android/settings/backup/BackupSettingsHelper.java b/src/com/android/settings/backup/BackupSettingsHelper.java index 15f1dab92f3..5f8ff9e8f60 100644 --- a/src/com/android/settings/backup/BackupSettingsHelper.java +++ b/src/com/android/settings/backup/BackupSettingsHelper.java @@ -24,9 +24,10 @@ import android.content.Intent; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.Settings.PrivacySettingsActivity; diff --git a/src/com/android/settings/backup/BackupSettingsPreferenceController.java b/src/com/android/settings/backup/BackupSettingsPreferenceController.java index ec0c011585c..2a657eabb9f 100644 --- a/src/com/android/settings/backup/BackupSettingsPreferenceController.java +++ b/src/com/android/settings/backup/BackupSettingsPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.backup; import android.content.Context; import android.content.Intent; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/backup/ToggleBackupSettingFragment.java b/src/com/android/settings/backup/ToggleBackupSettingFragment.java index d7ff0e6de9e..d6dea8bd597 100644 --- a/src/com/android/settings/backup/ToggleBackupSettingFragment.java +++ b/src/com/android/settings/backup/ToggleBackupSettingFragment.java @@ -9,13 +9,14 @@ import android.os.Bundle; import android.os.RemoteException; import android.os.ServiceManager; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.PreferenceViewHolder; import android.util.Log; import android.view.View; import android.widget.TextView; +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; diff --git a/src/com/android/settings/bluetooth/AlwaysDiscoverable.java b/src/com/android/settings/bluetooth/AlwaysDiscoverable.java index 6f74b54b99b..20f1f12e256 100644 --- a/src/com/android/settings/bluetooth/AlwaysDiscoverable.java +++ b/src/com/android/settings/bluetooth/AlwaysDiscoverable.java @@ -21,15 +21,11 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.os.Handler; + import androidx.annotation.VisibleForTesting; -import android.util.Log; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; -import java.util.Timer; -import java.util.TimerTask; - /** Helper class, intended to be used by an Activity, to keep the local Bluetooth adapter in * discoverable mode indefinitely. By default setting the scan mode to * BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE will time out after some time, but some diff --git a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java index 930d9ff7d9e..084b502a03d 100644 --- a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java @@ -18,14 +18,15 @@ package com.android.settings.bluetooth; import android.bluetooth.BluetoothProfile; import android.content.Context; import android.media.AudioManager; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; -import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.CachedBluetoothDevice; -import androidx.preference.Preference; +import com.android.settingslib.bluetooth.LocalBluetoothManager; /** * Controller to maintain available media Bluetooth devices diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java index 20806458cb6..ede0b834170 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import android.content.Context; + import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsController.java index 6ea49a6236d..c68656c38bf 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsController.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import android.content.Context; + import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java index dca7e201bd4..f9ecd8e3ee1 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java @@ -18,18 +18,18 @@ package com.android.settings.bluetooth; import android.content.Context; import android.graphics.drawable.Drawable; +import android.util.Pair; + import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; -import android.util.Pair; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.bluetooth.CachedBluetoothDevice; -import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.LocalBluetoothManager; +import com.android.settingslib.core.lifecycle.Lifecycle; /** * This class adds a header with device name and status (connected/disconnected, etc.). diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java index 72effe49271..082ea9f05fa 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import android.content.Context; + import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java index 90723540b5c..0285fec08c5 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java @@ -19,13 +19,14 @@ package com.android.settings.bluetooth; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceFragment; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; +import androidx.preference.SwitchPreference; import com.android.settingslib.bluetooth.A2dpProfile; import com.android.settingslib.bluetooth.CachedBluetoothDevice; diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java index 630c2c57c7a..71231b3b826 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java @@ -21,11 +21,12 @@ import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH; import android.bluetooth.BluetoothDevice; import android.content.Context; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.RestrictedDashboardFragment; diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java index 61bed17fe42..95466501f1b 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java @@ -21,13 +21,14 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.BidiFormatter; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java index 39a14add554..e344df08347 100644 --- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java +++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java @@ -16,6 +16,8 @@ package com.android.settings.bluetooth; +import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH; + import android.app.AlertDialog; import android.bluetooth.BluetoothDevice; import android.content.Context; @@ -23,14 +25,15 @@ import android.content.DialogInterface; import android.content.res.Resources; import android.graphics.drawable.Drawable; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.Html; import android.text.TextUtils; import android.util.Pair; import android.util.TypedValue; import android.widget.ImageView; +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; @@ -38,8 +41,6 @@ import com.android.settings.widget.GearPreference; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; -import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH; - /** * BluetoothDevicePreference is the preference type used to display each remote * Bluetooth device in the Bluetooth Settings screen. diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java index 3b07bd3cd20..a217b87f5a3 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.bluetooth; import android.app.Fragment; import android.content.Context; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.text.TextUtils; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java index 71335c7fe79..65fd15c904b 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java @@ -19,9 +19,9 @@ import android.bluetooth.BluetoothDevice; import android.content.Context; import android.os.Bundle; import android.os.SystemProperties; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.util.Log; import com.android.settings.R; import com.android.settings.connecteddevice.DevicePreferenceCallback; diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java index 189df3a4998..0ab45bb2471 100755 --- a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java +++ b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java @@ -24,9 +24,10 @@ import android.content.IntentFilter; import android.content.SharedPreferences; import android.os.Handler; import android.os.SystemProperties; -import androidx.preference.Preference; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; diff --git a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java index 8ce701748c1..3f566f0373a 100644 --- a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java @@ -16,9 +16,10 @@ package com.android.settings.bluetooth; -import android.content.pm.PackageManager; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java index 85abadeddcc..0eb97462887 100644 --- a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java @@ -29,7 +29,6 @@ import android.text.TextWatcher; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; -import android.view.WindowManager; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethodManager; import android.widget.Button; diff --git a/src/com/android/settings/bluetooth/BluetoothPairingController.java b/src/com/android/settings/bluetooth/BluetoothPairingController.java index 5120cc0ff9b..ef5648cf564 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingController.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingController.java @@ -23,10 +23,12 @@ import android.text.Editable; import android.util.Log; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; + import com.android.settings.R; import com.android.settings.bluetooth.BluetoothPairingDialogFragment.BluetoothPairingDialogListener; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfile; + import java.util.Locale; /** diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java index b3f60967c49..23ff044f619 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java @@ -22,9 +22,10 @@ import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.content.Context; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.Indexable; diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java index f1960e8b18a..813300597e3 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java @@ -24,6 +24,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; + import androidx.annotation.VisibleForTesting; /** diff --git a/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java index 3d8d038ddfa..0ce00deb1fd 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java index 4d02fd50c31..7da63428c72 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java @@ -20,7 +20,6 @@ import android.bluetooth.BluetoothDevice; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.content.res.Resources; import android.os.PowerManager; import android.os.UserHandle; diff --git a/src/com/android/settings/bluetooth/BluetoothPairingService.java b/src/com/android/settings/bluetooth/BluetoothPairingService.java index 4fedb6d4f32..d93a7989525 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingService.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingService.java @@ -17,15 +17,15 @@ package com.android.settings.bluetooth; import android.app.Notification; -import android.app.NotificationManager; import android.app.NotificationChannel; +import android.app.NotificationManager; import android.app.PendingIntent; import android.app.Service; import android.bluetooth.BluetoothDevice; -import android.content.IntentFilter; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.content.IntentFilter; import android.content.res.Resources; import android.os.IBinder; import android.text.TextUtils; diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java index 21e8fb8c93d..83ddbd3f611 100644 --- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java +++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java @@ -23,12 +23,13 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; -import androidx.preference.Preference; import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.TextView; +import androidx.preference.Preference; + import com.android.internal.app.AlertActivity; import com.android.internal.app.AlertController; import com.android.settings.R; diff --git a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java index 7a731ec2033..f89b1f410ca 100644 --- a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java +++ b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java @@ -26,7 +26,11 @@ import android.content.Intent; import android.content.IntentFilter; import android.net.Uri; import android.provider.SettingsSlicesContract; + import androidx.core.graphics.drawable.IconCompat; +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; @@ -37,10 +41,6 @@ import com.android.settings.slices.SliceBroadcastReceiver; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; -import androidx.slice.Slice; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.SliceAction; - public class BluetoothSliceBuilder { private static final String TAG = "BluetoothSliceBuilder"; diff --git a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java index 62fc4eff558..4a5d78fccf0 100644 --- a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java +++ b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java @@ -19,9 +19,10 @@ package com.android.settings.bluetooth; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.content.Context; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.widget.SummaryUpdater; import com.android.settingslib.bluetooth.BluetoothCallback; @@ -29,7 +30,6 @@ import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; -import java.util.Collection; import java.util.Set; /** diff --git a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java index c22aa5a2ffe..77e00f715b2 100644 --- a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java @@ -19,9 +19,10 @@ import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; import android.media.AudioManager; +import android.util.Log; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.util.Log; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java index 688fd27e415..baad9aeb6d8 100644 --- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java +++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java @@ -20,12 +20,13 @@ import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.os.Bundle; import android.os.SystemProperties; +import android.text.BidiFormatter; +import android.util.Log; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; -import android.text.BidiFormatter; -import android.util.Log; import com.android.settings.R; import com.android.settings.dashboard.RestrictedDashboardFragment; diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java index 3a6865355ed..6c2876db215 100644 --- a/src/com/android/settings/bluetooth/DevicePickerFragment.java +++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java @@ -25,10 +25,11 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; import android.view.Menu; 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; diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java index d6cdb239d4a..6098014f63a 100644 --- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java +++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java @@ -23,7 +23,6 @@ import android.bluetooth.BluetoothProfile; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; import android.text.Html; import android.text.TextUtils; import android.util.Log; @@ -35,6 +34,8 @@ import android.widget.CheckBox; import android.widget.EditText; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java index 19eb2005f1c..2a659013eb6 100644 --- a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java +++ b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java @@ -16,7 +16,6 @@ package com.android.settings.bluetooth; -import android.app.QueuedWork; import android.content.Context; import android.content.SharedPreferences; import android.content.res.Configuration; diff --git a/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java b/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java index 3ba38448e27..aaa7b507f71 100644 --- a/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java +++ b/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java @@ -21,18 +21,12 @@ import android.app.admin.DevicePolicyManager; import android.bluetooth.BluetoothAdapter; import android.content.DialogInterface; import android.content.Intent; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; import android.os.Bundle; import android.os.UserManager; -import androidx.annotation.NonNull; -import android.text.TextUtils; import android.util.Log; import com.android.internal.app.AlertActivity; import com.android.internal.app.AlertController; -import com.android.internal.util.ArrayUtils; -import com.android.internal.util.CharSequences; import com.android.settings.R; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; diff --git a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java index 1dfa6472e61..a70bc94cb31 100644 --- a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java @@ -18,14 +18,14 @@ package com.android.settings.bluetooth; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; + import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothManager; -import androidx.preference.Preference; -import android.util.Log; /** * Maintain and update saved bluetooth devices(bonded but not connected) diff --git a/src/com/android/settings/bluetooth/Utils.java b/src/com/android/settings/bluetooth/Utils.java index daaac314fb1..f125f6f8476 100755 --- a/src/com/android/settings/bluetooth/Utils.java +++ b/src/com/android/settings/bluetooth/Utils.java @@ -22,9 +22,10 @@ import android.bluetooth.BluetoothProfile; import android.content.Context; import android.content.DialogInterface; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; 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.overlay.FeatureFactory; diff --git a/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java b/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java index 9730515343d..3239dd5b32f 100644 --- a/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java +++ b/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java @@ -21,11 +21,12 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.core.BasePreferenceController; import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java index b089b4a9350..26c3e345558 100644 --- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java +++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java @@ -17,7 +17,9 @@ package com.android.settings.connecteddevice; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.nfc.NfcPreferenceController; diff --git a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java index f94e81a6d4e..8db49068aa2 100644 --- a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java +++ b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java @@ -19,16 +19,18 @@ import static com.android.settingslib.Utils.isAudioModeOngoingCall; import android.content.Context; import android.content.pm.PackageManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; + +import com.android.settings.R; import com.android.settings.bluetooth.AvailableMediaBluetoothDeviceUpdater; import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.bluetooth.Utils; import com.android.settings.core.BasePreferenceController; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.R; import com.android.settingslib.bluetooth.BluetoothCallback; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothManager; diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java index b30aff13294..c4c9369eddc 100644 --- a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java @@ -19,17 +19,14 @@ import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothManager; 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.settings.SettingsActivity; import com.android.settings.bluetooth.BluetoothDeviceRenamePreferenceController; import com.android.settings.bluetooth.BluetoothSwitchPreferenceController; -import com.android.settings.core.SubSettingLauncher; import com.android.settings.core.TogglePreferenceController; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.location.ScanningSettings; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.SearchIndexableRaw; import com.android.settings.widget.SwitchBar; diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java index cf6bd1392c1..60dd14b2140 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java @@ -18,13 +18,13 @@ package com.android.settings.connecteddevice; import android.app.Activity; 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.dashboard.SummaryLoader; -import com.android.settings.nfc.NfcPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java index aa0b6cd54fd..2b8fefadca7 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java @@ -15,8 +15,9 @@ */ package com.android.settings.connecteddevice; -import android.content.pm.PackageManager; import android.content.Context; +import android.content.pm.PackageManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; @@ -31,9 +32,9 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.overlay.DockUpdaterFeatureProvider; import com.android.settings.overlay.FeatureFactory; +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.core.lifecycle.LifecycleObserver; /** * Controller to maintain the {@link androidx.preference.PreferenceGroup} for all diff --git a/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java b/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java index cafc0a3dc23..3d84348dc5d 100644 --- a/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java +++ b/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java @@ -22,21 +22,22 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; -import androidx.preference.PreferenceScreen; import android.text.BidiFormatter; import android.text.TextUtils; +import androidx.preference.PreferenceScreen; + import com.android.internal.annotations.VisibleForTesting; +import com.android.settings.R; import com.android.settings.bluetooth.AlwaysDiscoverable; import com.android.settings.bluetooth.Utils; import com.android.settings.core.BasePreferenceController; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.R; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; +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.core.lifecycle.LifecycleObserver; import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.FooterPreferenceMixin; diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java index 195daf372ff..c1dd6ed127c 100644 --- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java @@ -17,6 +17,7 @@ package com.android.settings.connecteddevice; 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; diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java index 81d61209236..23598a0399f 100644 --- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java +++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java @@ -17,20 +17,18 @@ package com.android.settings.connecteddevice; import android.content.Context; import android.content.pm.PackageManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Log; import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater; import com.android.settings.core.BasePreferenceController; import com.android.settings.dashboard.DashboardFragment; - 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.utils.ThreadUtils; public class PreviouslyConnectedDevicePreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart, OnStop, DevicePreferenceCallback { diff --git a/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java b/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java index 4bc9cdd637f..81390a797c2 100644 --- a/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java +++ b/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java @@ -15,8 +15,9 @@ */ package com.android.settings.connecteddevice; -import android.content.pm.PackageManager; import android.content.Context; +import android.content.pm.PackageManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; diff --git a/src/com/android/settings/connecteddevice/dock/DockUpdater.java b/src/com/android/settings/connecteddevice/dock/DockUpdater.java index 19ee7324179..7be79ed1503 100644 --- a/src/com/android/settings/connecteddevice/dock/DockUpdater.java +++ b/src/com/android/settings/connecteddevice/dock/DockUpdater.java @@ -15,8 +15,6 @@ */ package com.android.settings.connecteddevice.dock; -import android.content.Context; - /** * Update the dock devices. It notifies the upper level whether to add/remove the preference * through {@link DevicePreferenceCallback} diff --git a/src/com/android/settings/connecteddevice/dock/DockUpdaterFeatureProviderImpl.java b/src/com/android/settings/connecteddevice/dock/DockUpdaterFeatureProviderImpl.java index 7cd2d508519..7caaae609ee 100644 --- a/src/com/android/settings/connecteddevice/dock/DockUpdaterFeatureProviderImpl.java +++ b/src/com/android/settings/connecteddevice/dock/DockUpdaterFeatureProviderImpl.java @@ -3,7 +3,6 @@ package com.android.settings.connecteddevice.dock; import android.content.Context; import com.android.settings.connecteddevice.DevicePreferenceCallback; -import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.overlay.DockUpdaterFeatureProvider; /** diff --git a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java index 90df30880f0..be253e1cbc6 100644 --- a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java +++ b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java @@ -18,6 +18,7 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/connecteddevice/usb/UsbBackend.java b/src/com/android/settings/connecteddevice/usb/UsbBackend.java index e030757f4de..f68a4a07f43 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbBackend.java +++ b/src/com/android/settings/connecteddevice/usb/UsbBackend.java @@ -24,6 +24,7 @@ import android.hardware.usb.UsbPortStatus; import android.net.ConnectivityManager; import android.os.UserHandle; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; /** diff --git a/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java b/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java index 1b525352d0f..1d43371a02c 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java +++ b/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java @@ -24,8 +24,8 @@ import android.hardware.usb.UsbPort; import android.hardware.usb.UsbPortStatus; import com.android.settingslib.core.lifecycle.LifecycleObserver; -import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; /** * Receiver to receive usb update and use {@link UsbConnectionListener} to invoke callback diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java index cb54216649a..e7544e3a04d 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java @@ -18,6 +18,7 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.os.Handler; + import androidx.annotation.UiThread; import com.android.internal.annotations.VisibleForTesting; diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java index 2e336e48960..84576b14252 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java @@ -18,6 +18,7 @@ package com.android.settings.connecteddevice.usb; 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 d93df8066dd..b54847700ce 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java @@ -19,6 +19,7 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java index 8ae334c3a8f..e30237dd37b 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java @@ -19,6 +19,7 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; + import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java index c569e1f9bd2..0e1811d70ed 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java @@ -17,6 +17,7 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; + import androidx.preference.PreferenceScreen; import com.android.settings.R; diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java index ae21601e780..30314f6e2ca 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java @@ -18,11 +18,12 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.hardware.usb.UsbPort; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/core/BasePreferenceController.java b/src/com/android/settings/core/BasePreferenceController.java index 64b24772035..3c527184594 100644 --- a/src/com/android/settings/core/BasePreferenceController.java +++ b/src/com/android/settings/core/BasePreferenceController.java @@ -19,6 +19,9 @@ import android.content.IntentFilter; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.search.ResultPayload; import com.android.settings.search.SearchIndexableRaw; import com.android.settings.slices.SliceData; @@ -30,10 +33,6 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - /** * Abstract class to consolidate utility between preference controllers and act as an interface * for Slices. The abstract classes that inherit from this class will act as the direct interfaces diff --git a/src/com/android/settings/core/InstrumentedPreferenceFragment.java b/src/com/android/settings/core/InstrumentedPreferenceFragment.java index 3a3c3d9e190..12584e2f999 100644 --- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java +++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java @@ -18,11 +18,12 @@ package com.android.settings.core; import android.content.Context; import android.os.Bundle; -import androidx.annotation.XmlRes; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.XmlRes; +import androidx.preference.PreferenceScreen; + import com.android.settings.overlay.FeatureFactory; import com.android.settings.survey.SurveyMixin; import com.android.settingslib.core.instrumentation.Instrumentable; diff --git a/src/com/android/settings/core/PreferenceXmlParserUtils.java b/src/com/android/settings/core/PreferenceXmlParserUtils.java index a0534ab48ce..96399f68b5f 100644 --- a/src/com/android/settings/core/PreferenceXmlParserUtils.java +++ b/src/com/android/settings/core/PreferenceXmlParserUtils.java @@ -23,14 +23,15 @@ import android.content.Context; import android.content.res.TypedArray; import android.content.res.XmlResourceParser; import android.os.Bundle; -import androidx.annotation.IntDef; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; import android.util.TypedValue; import android.util.Xml; +import androidx.annotation.IntDef; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import org.xmlpull.v1.XmlPullParser; diff --git a/src/com/android/settings/core/SliderPreferenceController.java b/src/com/android/settings/core/SliderPreferenceController.java index 65c71eb4219..0ea6be30738 100644 --- a/src/com/android/settings/core/SliderPreferenceController.java +++ b/src/com/android/settings/core/SliderPreferenceController.java @@ -15,6 +15,7 @@ package com.android.settings.core; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.slices.SliceData; diff --git a/src/com/android/settings/core/SubSettingLauncher.java b/src/com/android/settings/core/SubSettingLauncher.java index 88fbb701d61..2dd059f387f 100644 --- a/src/com/android/settings/core/SubSettingLauncher.java +++ b/src/com/android/settings/core/SubSettingLauncher.java @@ -22,9 +22,10 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; + import com.android.settings.SettingsActivity; import com.android.settings.SubSettings; import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin; diff --git a/src/com/android/settings/core/TogglePreferenceController.java b/src/com/android/settings/core/TogglePreferenceController.java index 3a199b89650..165d7eb1305 100644 --- a/src/com/android/settings/core/TogglePreferenceController.java +++ b/src/com/android/settings/core/TogglePreferenceController.java @@ -14,6 +14,7 @@ package com.android.settings.core; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.TwoStatePreference; diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java index a8cb61cd848..17a295c7a60 100644 --- a/src/com/android/settings/core/gateway/SettingsGateway.java +++ b/src/com/android/settings/core/gateway/SettingsGateway.java @@ -79,9 +79,9 @@ import com.android.settings.gestures.AssistGestureSettings; import com.android.settings.gestures.DoubleTapPowerSettings; import com.android.settings.gestures.DoubleTapScreenSettings; import com.android.settings.gestures.DoubleTwistGestureSettings; -import com.android.settings.gestures.SwipeUpGestureSettings; import com.android.settings.gestures.PickupGestureSettings; import com.android.settings.gestures.SwipeToNotificationSettings; +import com.android.settings.gestures.SwipeUpGestureSettings; import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment; import com.android.settings.inputmethod.KeyboardLayoutPickerFragment; import com.android.settings.inputmethod.PhysicalKeyboardFragment; @@ -106,10 +106,8 @@ import com.android.settings.notification.NotificationStation; import com.android.settings.notification.SoundSettings; import com.android.settings.notification.ZenAccessSettings; import com.android.settings.notification.ZenModeAutomationSettings; -import com.android.settings.notification.ZenModeMsgEventReminderSettings; import com.android.settings.notification.ZenModeBlockedEffectsSettings; import com.android.settings.notification.ZenModeEventRuleSettings; -import com.android.settings.notification.ZenModeRestrictNotificationsSettings; import com.android.settings.notification.ZenModeScheduleRuleSettings; import com.android.settings.notification.ZenModeSettings; import com.android.settings.password.ChooseLockPassword; diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java index 27b45252683..5ce7f352b36 100644 --- a/src/com/android/settings/dashboard/DashboardAdapter.java +++ b/src/com/android/settings/dashboard/DashboardAdapter.java @@ -21,10 +21,6 @@ import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.service.settings.suggestions.Suggestion; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.DiffUtil; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -34,6 +30,11 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.DiffUtil; +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.R.id; diff --git a/src/com/android/settings/dashboard/DashboardData.java b/src/com/android/settings/dashboard/DashboardData.java index 2ef4abe84b1..f324cd4907d 100644 --- a/src/com/android/settings/dashboard/DashboardData.java +++ b/src/com/android/settings/dashboard/DashboardData.java @@ -18,9 +18,10 @@ package com.android.settings.dashboard; import android.annotation.IntDef; import android.graphics.drawable.Drawable; import android.service.settings.suggestions.Suggestion; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.recyclerview.widget.DiffUtil; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.dashboard.conditional.Condition; diff --git a/src/com/android/settings/dashboard/DashboardFeatureProvider.java b/src/com/android/settings/dashboard/DashboardFeatureProvider.java index b1f66ae4792..2a25c24d936 100644 --- a/src/com/android/settings/dashboard/DashboardFeatureProvider.java +++ b/src/com/android/settings/dashboard/DashboardFeatureProvider.java @@ -17,6 +17,7 @@ package com.android.settings.dashboard; import android.app.Activity; import android.content.Context; + import androidx.preference.Preference; import com.android.settingslib.drawer.DashboardCategory; diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java index c98c982013d..397b2bfd4db 100644 --- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java +++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java @@ -29,13 +29,14 @@ import android.content.pm.PackageManager; import android.graphics.drawable.Icon; import android.os.Bundle; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.ArrayMap; import android.util.Log; import android.util.Pair; +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.SettingsActivity; diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java index bef66c3650a..4cb9c8db3a4 100644 --- a/src/com/android/settings/dashboard/DashboardFragment.java +++ b/src/com/android/settings/dashboard/DashboardFragment.java @@ -19,15 +19,16 @@ import android.app.Activity; import android.content.Context; import android.content.res.TypedArray; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.SettingsPreferenceFragment; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerListHelper; diff --git a/src/com/android/settings/dashboard/DashboardItemAnimator.java b/src/com/android/settings/dashboard/DashboardItemAnimator.java index 73224ab2358..51dd49eea3e 100644 --- a/src/com/android/settings/dashboard/DashboardItemAnimator.java +++ b/src/com/android/settings/dashboard/DashboardItemAnimator.java @@ -18,6 +18,7 @@ package com.android.settings.dashboard; import androidx.core.view.ViewCompat; import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.RecyclerView.ViewHolder; + import com.android.settingslib.drawer.Tile; public class DashboardItemAnimator extends DefaultItemAnimator { diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java index e680afdfab3..94b4e0d45e3 100644 --- a/src/com/android/settings/dashboard/DashboardSummary.java +++ b/src/com/android/settings/dashboard/DashboardSummary.java @@ -22,14 +22,15 @@ import android.content.Context; import android.os.Bundle; import android.os.Handler; import android.service.settings.suggestions.Suggestion; -import androidx.annotation.VisibleForTesting; -import androidx.annotation.WorkerThread; -import androidx.recyclerview.widget.LinearLayoutManager; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.VisibleForTesting; +import androidx.annotation.WorkerThread; +import androidx.recyclerview.widget.LinearLayoutManager; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.InstrumentedFragment; diff --git a/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java b/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java index 7b532752866..fc26e5521cd 100644 --- a/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java +++ b/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.dashboard; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/dashboard/RestrictedDashboardFragment.java b/src/com/android/settings/dashboard/RestrictedDashboardFragment.java index de0b39667de..8258678791a 100644 --- a/src/com/android/settings/dashboard/RestrictedDashboardFragment.java +++ b/src/com/android/settings/dashboard/RestrictedDashboardFragment.java @@ -32,9 +32,9 @@ import android.os.UserManager; import android.view.View; import android.widget.TextView; -import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settings.R; import com.android.settings.RestrictedSettingsFragment; +import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settingslib.RestrictedLockUtils; /** diff --git a/src/com/android/settings/dashboard/RoundedHomepageIcon.java b/src/com/android/settings/dashboard/RoundedHomepageIcon.java index 77acaf3ec12..c88619d6d54 100644 --- a/src/com/android/settings/dashboard/RoundedHomepageIcon.java +++ b/src/com/android/settings/dashboard/RoundedHomepageIcon.java @@ -22,6 +22,7 @@ import android.content.Context; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; + import androidx.annotation.VisibleForTesting; import com.android.settings.R; diff --git a/src/com/android/settings/dashboard/SummaryLoader.java b/src/com/android/settings/dashboard/SummaryLoader.java index a97113147ed..eddad452d3c 100644 --- a/src/com/android/settings/dashboard/SummaryLoader.java +++ b/src/com/android/settings/dashboard/SummaryLoader.java @@ -25,12 +25,13 @@ import android.os.HandlerThread; import android.os.Looper; import android.os.Message; import android.os.Process; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.SettingsActivity; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.drawer.DashboardCategory; diff --git a/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java b/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java index fdd1508db81..94d89a9dfda 100644 --- a/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java +++ b/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java @@ -22,7 +22,6 @@ import android.os.PowerManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; -import com.android.settings.fuelgauge.BatterySaverDrawable; import com.android.settings.fuelgauge.BatterySaverReceiver; import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings; import com.android.settingslib.fuelgauge.BatterySaverUtils; diff --git a/src/com/android/settings/dashboard/conditional/Condition.java b/src/com/android/settings/dashboard/conditional/Condition.java index f3a3b9c05a5..bfefe3bed74 100644 --- a/src/com/android/settings/dashboard/conditional/Condition.java +++ b/src/com/android/settings/dashboard/conditional/Condition.java @@ -21,6 +21,7 @@ import android.content.Context; import android.content.IntentFilter; import android.graphics.drawable.Drawable; import android.os.PersistableBundle; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/dashboard/conditional/ConditionAdapter.java b/src/com/android/settings/dashboard/conditional/ConditionAdapter.java index 923f1241a53..4c4463105d6 100644 --- a/src/com/android/settings/dashboard/conditional/ConditionAdapter.java +++ b/src/com/android/settings/dashboard/conditional/ConditionAdapter.java @@ -16,15 +16,16 @@ package com.android.settings.dashboard.conditional; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.ItemTouchHelper; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.ItemTouchHelper; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardAdapter.DashboardItemHolder; diff --git a/src/com/android/settings/dashboard/conditional/DndCondition.java b/src/com/android/settings/dashboard/conditional/DndCondition.java index 6bcc67e60b8..2854ebb2673 100644 --- a/src/com/android/settings/dashboard/conditional/DndCondition.java +++ b/src/com/android/settings/dashboard/conditional/DndCondition.java @@ -25,6 +25,7 @@ import android.os.PersistableBundle; import android.provider.Settings; import android.provider.Settings.Global; import android.service.notification.ZenModeConfig; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/dashboard/conditional/FocusRecyclerView.java b/src/com/android/settings/dashboard/conditional/FocusRecyclerView.java index fc44d0de3ff..abe4743cb3e 100644 --- a/src/com/android/settings/dashboard/conditional/FocusRecyclerView.java +++ b/src/com/android/settings/dashboard/conditional/FocusRecyclerView.java @@ -16,9 +16,10 @@ package com.android.settings.dashboard.conditional; import android.content.Context; +import android.util.AttributeSet; + import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; -import android.util.AttributeSet; /** * Version of RecyclerView that can have listeners for onWindowFocusChanged. diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java index 4a3bc334645..6ddb974291e 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java @@ -23,8 +23,6 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.os.Bundle; import android.service.settings.suggestions.Suggestion; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.DisplayMetrics; import android.util.Log; @@ -32,9 +30,11 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; -import android.widget.ImageView; import android.widget.LinearLayout; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardAdapter.DashboardItemHolder; diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java index ef3513c4d42..f40f2b772d1 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java @@ -20,9 +20,10 @@ import android.content.ComponentName; import android.content.Context; import android.content.SharedPreferences; import android.service.settings.suggestions.Suggestion; -import androidx.annotation.NonNull; import android.util.Pair; +import androidx.annotation.NonNull; + import com.android.settingslib.drawer.Tile; import com.android.settingslib.suggestions.SuggestionControllerMixin; diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java index 6ff7ef3795d..20a9aeaa25a 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java @@ -21,10 +21,11 @@ import android.content.ComponentName; import android.content.Context; import android.content.SharedPreferences; import android.service.settings.suggestions.Suggestion; -import androidx.annotation.NonNull; import android.util.Log; import android.util.Pair; +import androidx.annotation.NonNull; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.Settings.NightDisplaySuggestionActivity; diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java index 1474f83e55a..8547db0ff03 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java @@ -25,9 +25,10 @@ import android.content.Context; import android.database.Cursor; import android.net.Uri; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.overlay.FeatureFactory; public class SuggestionStateProvider extends ContentProvider { diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java index 79adfdab352..7a422368b56 100644 --- a/src/com/android/settings/datausage/AppDataUsage.java +++ b/src/com/android/settings/datausage/AppDataUsage.java @@ -32,15 +32,16 @@ import android.net.TrafficStats; import android.os.Bundle; import android.os.RemoteException; import android.os.UserHandle; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; import android.util.ArraySet; import android.util.IconDrawableFactory; import android.util.Log; import android.view.View; import android.widget.AdapterView; +import androidx.annotation.VisibleForTesting; +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.applications.AppInfoBase; diff --git a/src/com/android/settings/datausage/AppDataUsagePreference.java b/src/com/android/settings/datausage/AppDataUsagePreference.java index 7595eb56a48..0eab5ab936b 100644 --- a/src/com/android/settings/datausage/AppDataUsagePreference.java +++ b/src/com/android/settings/datausage/AppDataUsagePreference.java @@ -15,10 +15,11 @@ package com.android.settings.datausage; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.view.View; import android.widget.ProgressBar; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.widget.AppPreference; import com.android.settingslib.AppItem; import com.android.settingslib.net.UidDetail; diff --git a/src/com/android/settings/datausage/AppPrefLoader.java b/src/com/android/settings/datausage/AppPrefLoader.java index 690ac2dbfcf..9df741abd5d 100644 --- a/src/com/android/settings/datausage/AppPrefLoader.java +++ b/src/com/android/settings/datausage/AppPrefLoader.java @@ -19,8 +19,10 @@ package com.android.settings.datausage; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; -import androidx.preference.Preference; import android.util.ArraySet; + +import androidx.preference.Preference; + import com.android.settingslib.utils.AsyncLoader; public class AppPrefLoader extends AsyncLoader> { diff --git a/src/com/android/settings/datausage/BillingCyclePreference.java b/src/com/android/settings/datausage/BillingCyclePreference.java index 9ed6ea7df0e..d92e4f6b866 100644 --- a/src/com/android/settings/datausage/BillingCyclePreference.java +++ b/src/com/android/settings/datausage/BillingCyclePreference.java @@ -21,13 +21,13 @@ import android.content.Intent; import android.net.NetworkTemplate; import android.os.Bundle; import android.os.RemoteException; -import androidx.preference.Preference; import android.util.AttributeSet; import android.util.FeatureFlagUtils; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; - import com.android.settings.core.FeatureFlags; import com.android.settings.core.SubSettingLauncher; import com.android.settings.datausage.CellDataPreference.DataStateListener; diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java index 5cdf22a8970..de74f550aae 100644 --- a/src/com/android/settings/datausage/BillingCycleSettings.java +++ b/src/com/android/settings/datausage/BillingCycleSettings.java @@ -27,8 +27,6 @@ import android.content.res.Resources; import android.net.NetworkPolicy; import android.net.NetworkTemplate; import android.os.Bundle; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.text.format.Time; import android.util.FeatureFlagUtils; import android.util.Log; @@ -38,6 +36,9 @@ import android.widget.EditText; import android.widget.NumberPicker; import android.widget.Spinner; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/datausage/CellDataPreference.java b/src/com/android/settings/datausage/CellDataPreference.java index fb97cd89320..a5808737417 100644 --- a/src/com/android/settings/datausage/CellDataPreference.java +++ b/src/com/android/settings/datausage/CellDataPreference.java @@ -25,9 +25,6 @@ import android.os.Looper; import android.os.Parcel; import android.os.Parcelable; import android.provider.Settings.Global; -import androidx.annotation.VisibleForTesting; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.PreferenceViewHolder; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -36,6 +33,10 @@ import android.util.Log; import android.view.View; import android.widget.Checkable; +import androidx.annotation.VisibleForTesting; +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; diff --git a/src/com/android/settings/datausage/ChartDataUsagePreference.java b/src/com/android/settings/datausage/ChartDataUsagePreference.java index 2a58840ed88..a9bcf3b5aa8 100644 --- a/src/com/android/settings/datausage/ChartDataUsagePreference.java +++ b/src/com/android/settings/datausage/ChartDataUsagePreference.java @@ -18,9 +18,6 @@ import android.content.Context; import android.net.NetworkPolicy; import android.net.NetworkStatsHistory; import android.net.TrafficStats; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.SpannableStringBuilder; import android.text.TextUtils; import android.text.format.Formatter; @@ -28,6 +25,10 @@ import android.text.style.ForegroundColorSpan; import android.util.AttributeSet; import android.util.SparseIntArray; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.graph.UsageView; diff --git a/src/com/android/settings/datausage/DataSaverPreference.java b/src/com/android/settings/datausage/DataSaverPreference.java index 3e29896a383..79e4c130a0a 100644 --- a/src/com/android/settings/datausage/DataSaverPreference.java +++ b/src/com/android/settings/datausage/DataSaverPreference.java @@ -15,8 +15,10 @@ package com.android.settings.datausage; import android.content.Context; -import androidx.preference.Preference; import android.util.AttributeSet; + +import androidx.preference.Preference; + import com.android.settings.R; public class DataSaverPreference extends Preference implements DataSaverBackend.Listener { diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java index 47887b3d493..0be579c11c3 100644 --- a/src/com/android/settings/datausage/DataSaverSummary.java +++ b/src/com/android/settings/datausage/DataSaverSummary.java @@ -16,9 +16,10 @@ package com.android.settings.datausage; import android.app.Application; import android.os.Bundle; -import androidx.preference.Preference; 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; diff --git a/src/com/android/settings/datausage/DataUsageBase.java b/src/com/android/settings/datausage/DataUsageBase.java index b889a2f5812..5939048f7b0 100644 --- a/src/com/android/settings/datausage/DataUsageBase.java +++ b/src/com/android/settings/datausage/DataUsageBase.java @@ -33,6 +33,7 @@ import android.os.UserManager; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.util.Log; + import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.NetworkPolicyEditor; diff --git a/src/com/android/settings/datausage/DataUsageBaseFragment.java b/src/com/android/settings/datausage/DataUsageBaseFragment.java index e9c73ff8cc3..512b358d682 100644 --- a/src/com/android/settings/datausage/DataUsageBaseFragment.java +++ b/src/com/android/settings/datausage/DataUsageBaseFragment.java @@ -34,7 +34,6 @@ import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.util.Log; -import com.android.settings.SettingsPreferenceFragment; import com.android.settings.dashboard.DashboardFragment; import com.android.settingslib.NetworkPolicyEditor; diff --git a/src/com/android/settings/datausage/DataUsageEditController.java b/src/com/android/settings/datausage/DataUsageEditController.java index adc0fe7dd01..edc30b1d4c4 100644 --- a/src/com/android/settings/datausage/DataUsageEditController.java +++ b/src/com/android/settings/datausage/DataUsageEditController.java @@ -15,6 +15,7 @@ package com.android.settings.datausage; import android.net.NetworkTemplate; + import com.android.settingslib.NetworkPolicyEditor; /** diff --git a/src/com/android/settings/datausage/DataUsageInfoController.java b/src/com/android/settings/datausage/DataUsageInfoController.java index 115e45e50a2..a471c39a736 100644 --- a/src/com/android/settings/datausage/DataUsageInfoController.java +++ b/src/com/android/settings/datausage/DataUsageInfoController.java @@ -15,6 +15,7 @@ package com.android.settings.datausage; import android.net.NetworkPolicy; + import com.android.settingslib.net.DataUsageController.DataUsageInfo; /** diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java index 2ab75ee0268..7be55f5dbe7 100644 --- a/src/com/android/settings/datausage/DataUsageList.java +++ b/src/com/android/settings/datausage/DataUsageList.java @@ -41,9 +41,6 @@ import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -55,6 +52,10 @@ import android.widget.AdapterView; import android.widget.AdapterView.OnItemSelectedListener; import android.widget.Spinner; +import androidx.annotation.VisibleForTesting; +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; diff --git a/src/com/android/settings/datausage/DataUsagePreference.java b/src/com/android/settings/datausage/DataUsagePreference.java index 9e6684c3684..f0deb49b5f9 100644 --- a/src/com/android/settings/datausage/DataUsagePreference.java +++ b/src/com/android/settings/datausage/DataUsagePreference.java @@ -19,11 +19,12 @@ import android.content.Intent; import android.content.res.TypedArray; import android.net.NetworkTemplate; import android.os.Bundle; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.Preference; import android.util.AttributeSet; import android.util.FeatureFlagUtils; +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.FeatureFlags; diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java index b6e72dd83d6..71fb5ca42f1 100644 --- a/src/com/android/settings/datausage/DataUsageSummary.java +++ b/src/com/android/settings/datausage/DataUsageSummary.java @@ -21,9 +21,6 @@ import android.content.Intent; import android.net.NetworkTemplate; import android.os.Bundle; import android.provider.SearchIndexableResource; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.SubscriptionPlan; @@ -35,6 +32,10 @@ import android.text.format.Formatter; import android.text.style.RelativeSizeSpan; import android.view.MenuItem; +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; diff --git a/src/com/android/settings/datausage/DataUsageSummaryLegacy.java b/src/com/android/settings/datausage/DataUsageSummaryLegacy.java index 1818b305e33..7ce968ad7c3 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryLegacy.java +++ b/src/com/android/settings/datausage/DataUsageSummaryLegacy.java @@ -23,9 +23,6 @@ import android.net.NetworkTemplate; import android.os.Bundle; import android.os.UserManager; import android.provider.SearchIndexableResource; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.text.BidiFormatter; @@ -38,6 +35,10 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +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.SummaryPreference; diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java index b687127ca6a..3a357a1da2d 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java @@ -22,8 +22,6 @@ import android.content.Intent; import android.graphics.Typeface; import android.net.NetworkTemplate; import android.os.Bundle; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; @@ -35,6 +33,9 @@ import android.widget.Button; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java index e973e6126f2..6338798b27c 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java @@ -21,9 +21,6 @@ import android.content.Context; import android.content.Intent; import android.net.NetworkPolicyManager; import android.net.NetworkTemplate; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.recyclerview.widget.RecyclerView; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.SubscriptionPlan; @@ -31,6 +28,10 @@ import android.text.TextUtils; import android.util.Log; import android.util.RecurrenceRule; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.util.CollectionUtils; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/datausage/NetworkRestrictionsPreference.java b/src/com/android/settings/datausage/NetworkRestrictionsPreference.java index e4c6beddcca..9afc0c32ab6 100644 --- a/src/com/android/settings/datausage/NetworkRestrictionsPreference.java +++ b/src/com/android/settings/datausage/NetworkRestrictionsPreference.java @@ -16,9 +16,10 @@ package com.android.settings.datausage; import android.content.Context; import android.net.NetworkTemplate; -import androidx.preference.Preference; import android.util.AttributeSet; +import androidx.preference.Preference; + public class NetworkRestrictionsPreference extends Preference implements TemplatePreference { public NetworkRestrictionsPreference(Context context, AttributeSet attrs) { diff --git a/src/com/android/settings/datausage/SpinnerPreference.java b/src/com/android/settings/datausage/SpinnerPreference.java index c0355b14456..867930baa97 100644 --- a/src/com/android/settings/datausage/SpinnerPreference.java +++ b/src/com/android/settings/datausage/SpinnerPreference.java @@ -15,12 +15,14 @@ package com.android.settings.datausage; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.widget.AdapterView; import android.widget.Spinner; + +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; public class SpinnerPreference extends Preference implements CycleAdapter.SpinnerInterface { diff --git a/src/com/android/settings/datausage/TemplatePreference.java b/src/com/android/settings/datausage/TemplatePreference.java index 4b1cd0cf828..158c3b67c2e 100644 --- a/src/com/android/settings/datausage/TemplatePreference.java +++ b/src/com/android/settings/datausage/TemplatePreference.java @@ -19,9 +19,9 @@ import android.net.NetworkPolicyManager; import android.net.NetworkTemplate; import android.os.INetworkManagementService; import android.os.UserManager; -import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; + import com.android.settingslib.NetworkPolicyEditor; public interface TemplatePreference { diff --git a/src/com/android/settings/datausage/TemplatePreferenceCategory.java b/src/com/android/settings/datausage/TemplatePreferenceCategory.java index 814a2595472..d26b9b18ae0 100644 --- a/src/com/android/settings/datausage/TemplatePreferenceCategory.java +++ b/src/com/android/settings/datausage/TemplatePreferenceCategory.java @@ -16,9 +16,10 @@ package com.android.settings.datausage; import android.content.Context; import android.net.NetworkTemplate; +import android.util.AttributeSet; + import androidx.preference.Preference; import androidx.preference.PreferenceCategory; -import android.util.AttributeSet; public class TemplatePreferenceCategory extends PreferenceCategory implements TemplatePreference { diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccess.java b/src/com/android/settings/datausage/UnrestrictedDataAccess.java index 7aa716c491b..b6d1a30f845 100644 --- a/src/com/android/settings/datausage/UnrestrictedDataAccess.java +++ b/src/com/android/settings/datausage/UnrestrictedDataAccess.java @@ -20,13 +20,14 @@ import android.app.Application; import android.content.Context; import android.os.Bundle; import android.os.UserHandle; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java b/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java index 42ea41a905a..7b7e0640666 100644 --- a/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java @@ -19,13 +19,16 @@ package com.android.settings.datetime; import android.content.Context; import android.provider.Settings; import android.provider.Settings.System; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.TwoStatePreference; import android.text.TextUtils; import android.text.format.DateFormat; + +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; + import java.util.Locale; public class AutoTimeFormatPreferenceController extends AbstractPreferenceController diff --git a/src/com/android/settings/datetime/AutoTimePreferenceController.java b/src/com/android/settings/datetime/AutoTimePreferenceController.java index 22c01ec7809..3916ef27316 100644 --- a/src/com/android/settings/datetime/AutoTimePreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimePreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.datetime; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java index f9a4821fa8a..4426bde99f4 100644 --- a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java @@ -18,8 +18,9 @@ package com.android.settings.datetime; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.Utils; diff --git a/src/com/android/settings/datetime/DatePreferenceController.java b/src/com/android/settings/datetime/DatePreferenceController.java index 856722ca460..1704bd6febd 100644 --- a/src/com/android/settings/datetime/DatePreferenceController.java +++ b/src/com/android/settings/datetime/DatePreferenceController.java @@ -20,12 +20,13 @@ import android.app.Activity; import android.app.AlarmManager; import android.app.DatePickerDialog; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import android.text.TextUtils; import android.text.format.DateFormat; import android.widget.DatePicker; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/datetime/TimeFormatPreferenceController.java b/src/com/android/settings/datetime/TimeFormatPreferenceController.java index 2be6b80afc6..3ad879a279a 100644 --- a/src/com/android/settings/datetime/TimeFormatPreferenceController.java +++ b/src/com/android/settings/datetime/TimeFormatPreferenceController.java @@ -19,12 +19,13 @@ package com.android.settings.datetime; import android.content.Context; import android.content.Intent; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.TwoStatePreference; import android.text.TextUtils; import android.text.format.DateFormat; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/datetime/TimePreferenceController.java b/src/com/android/settings/datetime/TimePreferenceController.java index 58173711a90..3ca26bc8a74 100644 --- a/src/com/android/settings/datetime/TimePreferenceController.java +++ b/src/com/android/settings/datetime/TimePreferenceController.java @@ -20,11 +20,12 @@ import android.app.Activity; import android.app.AlarmManager; import android.app.TimePickerDialog; import android.content.Context; -import androidx.preference.Preference; import android.text.TextUtils; import android.text.format.DateFormat; import android.widget.TimePicker; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/datetime/TimeZonePreferenceController.java b/src/com/android/settings/datetime/TimeZonePreferenceController.java index 743cb33c73b..99b76f6e9b7 100644 --- a/src/com/android/settings/datetime/TimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/TimeZonePreferenceController.java @@ -17,9 +17,10 @@ package com.android.settings.datetime; import android.content.Context; +import android.util.FeatureFlagUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.util.FeatureFlagUtils; import com.android.settings.core.FeatureFlags; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/datetime/ZonePicker.java b/src/com/android/settings/datetime/ZonePicker.java index 559a8b3b417..5bcc2a9b3a7 100644 --- a/src/com/android/settings/datetime/ZonePicker.java +++ b/src/com/android/settings/datetime/ZonePicker.java @@ -22,7 +22,6 @@ import android.app.AlarmManager; import android.app.ListFragment; import android.content.Context; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -33,6 +32,8 @@ import android.widget.ListView; import android.widget.SimpleAdapter; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java b/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java index 1a868b8f296..dd8481de362 100644 --- a/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java +++ b/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java @@ -17,11 +17,6 @@ package com.android.settings.datetime.timezone; import android.icu.text.BreakIterator; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; -import androidx.annotation.WorkerThread; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -29,6 +24,12 @@ import android.view.ViewGroup; import android.widget.Filter; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; +import androidx.annotation.WorkerThread; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.datetime.timezone.BaseTimeZonePicker.OnListItemClickListener; diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java b/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java index 83b85c07045..1ed851674ea 100644 --- a/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java +++ b/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java @@ -23,6 +23,7 @@ import android.content.res.Resources; import android.icu.text.DateFormat; import android.icu.text.SimpleDateFormat; import android.icu.util.Calendar; + import androidx.annotation.Nullable; import com.android.settings.R; diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java b/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java index 6d93ac91de2..887b9f2af99 100644 --- a/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java +++ b/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java @@ -17,9 +17,6 @@ package com.android.settings.datetime.timezone; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -30,7 +27,9 @@ import android.widget.LinearLayout; import android.widget.SearchView; import android.widget.TextView; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.core.InstrumentedFragment; import com.android.settings.datetime.timezone.model.TimeZoneData; diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java b/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java index 3e731f62715..8a0d73708ca 100644 --- a/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.datetime.timezone; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/datetime/timezone/RegionPreferenceController.java b/src/com/android/settings/datetime/timezone/RegionPreferenceController.java index efb3e4def7a..53959a69514 100644 --- a/src/com/android/settings/datetime/timezone/RegionPreferenceController.java +++ b/src/com/android/settings/datetime/timezone/RegionPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.datetime.timezone; import android.content.Context; import android.icu.text.LocaleDisplayNames; -import androidx.preference.Preference; import java.util.Locale; diff --git a/src/com/android/settings/datetime/timezone/RegionSearchPicker.java b/src/com/android/settings/datetime/timezone/RegionSearchPicker.java index e660c330648..0abf4e49a54 100644 --- a/src/com/android/settings/datetime/timezone/RegionSearchPicker.java +++ b/src/com/android/settings/datetime/timezone/RegionSearchPicker.java @@ -21,9 +21,10 @@ import android.content.Intent; import android.icu.text.Collator; import android.icu.text.LocaleDisplayNames; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; 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; diff --git a/src/com/android/settings/datetime/timezone/RegionZonePicker.java b/src/com/android/settings/datetime/timezone/RegionZonePicker.java index 7a3378acb5e..83d71f1c8d2 100644 --- a/src/com/android/settings/datetime/timezone/RegionZonePicker.java +++ b/src/com/android/settings/datetime/timezone/RegionZonePicker.java @@ -21,9 +21,10 @@ import android.icu.text.Collator; import android.icu.text.LocaleDisplayNames; import android.icu.util.TimeZone; import android.os.Bundle; +import android.util.Log; + import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; -import android.util.Log; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java b/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java index 79539c35772..a297ce60851 100644 --- a/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java +++ b/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.datetime.timezone; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java index c64726fbae4..233111aa2f1 100644 --- a/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java +++ b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java @@ -24,6 +24,7 @@ import android.icu.text.SimpleDateFormat; import android.icu.util.Calendar; import android.icu.util.TimeZone; import android.icu.util.TimeZoneTransition; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/datetime/timezone/TimeZoneSettings.java b/src/com/android/settings/datetime/timezone/TimeZoneSettings.java index 35488996584..a20cdb5d41e 100644 --- a/src/com/android/settings/datetime/timezone/TimeZoneSettings.java +++ b/src/com/android/settings/datetime/timezone/TimeZoneSettings.java @@ -23,13 +23,14 @@ import android.content.Intent; import android.content.SharedPreferences; import android.icu.util.TimeZone; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceCategory; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; 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; diff --git a/src/com/android/settings/deletionhelper/ActivationWarningFragment.java b/src/com/android/settings/deletionhelper/ActivationWarningFragment.java index f7d46d1c433..1f6fb6b24c7 100644 --- a/src/com/android/settings/deletionhelper/ActivationWarningFragment.java +++ b/src/com/android/settings/deletionhelper/ActivationWarningFragment.java @@ -19,8 +19,8 @@ package com.android.settings.deletionhelper; import android.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; -import android.content.DialogInterface; import android.os.Bundle; + import com.android.settings.R; /** diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java index 92aa61246fa..d11e68b64a4 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java @@ -16,11 +16,12 @@ package com.android.settings.deletionhelper; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.format.DateUtils; import android.text.format.Formatter; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.Utils; diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java index 9e41e62a4e1..20ac6ea5a86 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java @@ -20,13 +20,14 @@ import android.content.ContentResolver; import android.content.Context; import android.os.Bundle; import android.provider.Settings; -import androidx.preference.DropDownPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +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; diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java index 011deffc950..e7cddf36e96 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java @@ -20,14 +20,15 @@ import android.app.FragmentManager; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; -import androidx.preference.Preference; import android.widget.Switch; +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.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.Utils; +import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; /** Handles the logic for flipping the storage management toggle on a {@link SwitchBar}. */ public class AutomaticStorageManagerSwitchBarController diff --git a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java index 9608f17da10..0f21deebf0d 100644 --- a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java +++ b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java @@ -21,6 +21,7 @@ import android.bluetooth.BluetoothCodecConfig; import android.bluetooth.BluetoothCodecStatus; import android.bluetooth.BluetoothDevice; import android.content.Context; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/AdbPreferenceController.java b/src/com/android/settings/development/AdbPreferenceController.java index 86622eec5a7..468c5bdd5c9 100644 --- a/src/com/android/settings/development/AdbPreferenceController.java +++ b/src/com/android/settings/development/AdbPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.development; import android.content.Context; + import androidx.annotation.Nullable; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java index c785bb67e24..14474f29785 100644 --- a/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java +++ b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java b/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java index 35943951db4..766352a6cae 100644 --- a/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java +++ b/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.development; import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; +import android.view.IWindowManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; -import android.view.IWindowManager; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java index 19db369d285..15e26633439 100644 --- a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java +++ b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java @@ -17,9 +17,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java b/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java index 7333aad656a..690d079257c 100644 --- a/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java +++ b/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java @@ -20,6 +20,7 @@ import android.app.ActivityManager; import android.app.IActivityManager; import android.content.Context; import android.os.RemoteException; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java b/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java index 6ba0a80417a..b0e35d3de09 100644 --- a/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java +++ b/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java @@ -18,9 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java b/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java index 6fe03dd1fe8..d315517566c 100644 --- a/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java +++ b/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java @@ -19,7 +19,6 @@ package com.android.settings.development; import android.app.AlertDialog; import android.app.Dialog; import android.app.FragmentManager; -import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; import android.os.PowerManager; diff --git a/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java b/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java index 4ea2456f46f..77f0f507f8e 100644 --- a/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java +++ b/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java index 688f125d1a6..136ddad5fcf 100644 --- a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java +++ b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java @@ -18,10 +18,11 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java index 3e913bdfca1..849e981981b 100644 --- a/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java +++ b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java index 6ad3689334a..ee6af1c8785 100644 --- a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java +++ b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java index 4b1bf5cb292..c92fe90a936 100644 --- a/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java +++ b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/BugReportInPowerPreferenceController.java b/src/com/android/settings/development/BugReportInPowerPreferenceController.java index 22b9f2b86ae..99ced773255 100644 --- a/src/com/android/settings/development/BugReportInPowerPreferenceController.java +++ b/src/com/android/settings/development/BugReportInPowerPreferenceController.java @@ -19,9 +19,10 @@ package com.android.settings.development; import android.content.Context; import android.os.UserManager; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java index 74f879462c2..bc33a7c7b08 100644 --- a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java +++ b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java @@ -18,10 +18,11 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java index 9598b377f97..ce23e3fc03c 100644 --- a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java +++ b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java @@ -22,11 +22,12 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemProperties; import android.os.UserManager; +import android.text.TextUtils; +import android.util.Log; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; -import android.util.Log; import com.android.settings.Utils; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/ColorModePreference.java b/src/com/android/settings/development/ColorModePreference.java index 54ca4687850..9e5666ef22e 100644 --- a/src/com/android/settings/development/ColorModePreference.java +++ b/src/com/android/settings/development/ColorModePreference.java @@ -21,10 +21,11 @@ import android.hardware.display.DisplayManager; import android.hardware.display.DisplayManager.DisplayListener; import android.os.Handler; import android.os.Looper; -import androidx.preference.SwitchPreference; import android.util.AttributeSet; import android.view.Display; +import androidx.preference.SwitchPreference; + import com.android.settings.R; import java.util.ArrayList; diff --git a/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java b/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java index ae459acbcab..54df6badb02 100644 --- a/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java +++ b/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java @@ -18,10 +18,11 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; +import android.widget.Toast; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; -import android.widget.Toast; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/DarkUIPreferenceController.java b/src/com/android/settings/development/DarkUIPreferenceController.java index fc457716bc6..dc5eeb1fc53 100644 --- a/src/com/android/settings/development/DarkUIPreferenceController.java +++ b/src/com/android/settings/development/DarkUIPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.development; import android.app.UiModeManager; import android.content.Context; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java b/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java index 9b3f1d83471..da4b94b1593 100644 --- a/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java +++ b/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java @@ -18,11 +18,12 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.ListPreference; -import androidx.preference.Preference; import android.text.TextUtils; import android.view.ThreadedRenderer; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java b/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java index 03e3dab18e9..8f15c8697b6 100644 --- a/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java +++ b/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java @@ -18,11 +18,12 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.ListPreference; -import androidx.preference.Preference; import android.text.TextUtils; import android.view.ThreadedRenderer; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/DebugViewAttributesPreferenceController.java b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java index 8950b86bdcd..04d819c86a6 100644 --- a/src/com/android/settings/development/DebugViewAttributesPreferenceController.java +++ b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 8518c7446eb..a7cd761c066 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -28,14 +28,15 @@ import android.content.IntentFilter; import android.os.Bundle; import android.os.UserManager; import android.provider.SearchIndexableResource; -import androidx.annotation.VisibleForTesting; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; 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; diff --git a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java index 5ecb67633dd..f10e171c8c7 100644 --- a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java +++ b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java b/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java index 86663682d62..6348d623e19 100644 --- a/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java +++ b/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java @@ -18,9 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java b/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java index 9882975ff6b..163605fb175 100644 --- a/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java +++ b/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/FileEncryptionPreferenceController.java b/src/com/android/settings/development/FileEncryptionPreferenceController.java index f8326abf313..a0628b0f637 100644 --- a/src/com/android/settings/development/FileEncryptionPreferenceController.java +++ b/src/com/android/settings/development/FileEncryptionPreferenceController.java @@ -21,9 +21,10 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemProperties; import android.os.storage.IStorageManager; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java b/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java index 82ab190551b..fa9761af3ce 100644 --- a/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java +++ b/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/ForceMSAAPreferenceController.java b/src/com/android/settings/development/ForceMSAAPreferenceController.java index 17b5e4bdaca..be6efca8772 100644 --- a/src/com/android/settings/development/ForceMSAAPreferenceController.java +++ b/src/com/android/settings/development/ForceMSAAPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/FreeformWindowsPreferenceController.java b/src/com/android/settings/development/FreeformWindowsPreferenceController.java index e6c3813d448..5b19f36c152 100644 --- a/src/com/android/settings/development/FreeformWindowsPreferenceController.java +++ b/src/com/android/settings/development/FreeformWindowsPreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.development; import android.content.Context; import android.os.Build; import android.provider.Settings; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; -import android.text.TextUtils; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java b/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java index a7613763a79..d79c231e334 100644 --- a/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java +++ b/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java @@ -18,8 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java index 6b8ead5f5e2..0087e287093 100644 --- a/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java +++ b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java @@ -18,10 +18,11 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.view.ThreadedRenderer; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; diff --git a/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java b/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java index 4c501b6fb77..8ffbdcdc1cc 100644 --- a/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java +++ b/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java @@ -18,10 +18,11 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.view.ThreadedRenderer; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; diff --git a/src/com/android/settings/development/HardwareOverlaysPreferenceController.java b/src/com/android/settings/development/HardwareOverlaysPreferenceController.java index 69f1ba1003e..c10e1070a48 100644 --- a/src/com/android/settings/development/HardwareOverlaysPreferenceController.java +++ b/src/com/android/settings/development/HardwareOverlaysPreferenceController.java @@ -21,9 +21,10 @@ import android.os.IBinder; import android.os.Parcel; import android.os.RemoteException; import android.os.ServiceManager; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/HdcpCheckingPreferenceController.java b/src/com/android/settings/development/HdcpCheckingPreferenceController.java index 6dcca775209..52fe8e04a76 100644 --- a/src/com/android/settings/development/HdcpCheckingPreferenceController.java +++ b/src/com/android/settings/development/HdcpCheckingPreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.development; import android.content.Context; import android.os.Build; import android.os.SystemProperties; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/KeepActivitiesPreferenceController.java b/src/com/android/settings/development/KeepActivitiesPreferenceController.java index 839397b68e9..0ba2c42dbcf 100644 --- a/src/com/android/settings/development/KeepActivitiesPreferenceController.java +++ b/src/com/android/settings/development/KeepActivitiesPreferenceController.java @@ -21,10 +21,11 @@ import android.app.IActivityManager; import android.content.Context; import android.os.RemoteException; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java index 18e3a061cd8..d970f4266eb 100644 --- a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java +++ b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java @@ -21,6 +21,7 @@ import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/LocalTerminalPreferenceController.java b/src/com/android/settings/development/LocalTerminalPreferenceController.java index be60ed7c185..453ab3d7c74 100644 --- a/src/com/android/settings/development/LocalTerminalPreferenceController.java +++ b/src/com/android/settings/development/LocalTerminalPreferenceController.java @@ -3,10 +3,11 @@ package com.android.settings.development; import android.content.Context; import android.content.pm.PackageManager; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/LogPersistPreferenceController.java b/src/com/android/settings/development/LogPersistPreferenceController.java index 9c7a0378cb3..1386cec3706 100644 --- a/src/com/android/settings/development/LogPersistPreferenceController.java +++ b/src/com/android/settings/development/LogPersistPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.development; import android.content.Context; + import androidx.annotation.Nullable; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/LogdSizePreferenceController.java b/src/com/android/settings/development/LogdSizePreferenceController.java index cae07668471..3a62e63175e 100644 --- a/src/com/android/settings/development/LogdSizePreferenceController.java +++ b/src/com/android/settings/development/LogdSizePreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.development; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/MemoryUsagePreferenceController.java b/src/com/android/settings/development/MemoryUsagePreferenceController.java index 84120797c34..1b20e70a578 100644 --- a/src/com/android/settings/development/MemoryUsagePreferenceController.java +++ b/src/com/android/settings/development/MemoryUsagePreferenceController.java @@ -17,10 +17,11 @@ package com.android.settings.development; import android.content.Context; +import android.text.format.Formatter; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.format.Formatter; import com.android.settings.R; import com.android.settings.applications.ProcStatsData; diff --git a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java index 031ff9efdd8..78054ae2ab7 100644 --- a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java +++ b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/MockLocationAppPreferenceController.java b/src/com/android/settings/development/MockLocationAppPreferenceController.java index bbce58262db..b1bd48874cc 100644 --- a/src/com/android/settings/development/MockLocationAppPreferenceController.java +++ b/src/com/android/settings/development/MockLocationAppPreferenceController.java @@ -26,9 +26,10 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java index 5e159c65d57..775b70871f2 100644 --- a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java +++ b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java @@ -19,9 +19,10 @@ package com.android.settings.development; import android.content.Context; import android.os.Build; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/OemUnlockPreferenceController.java b/src/com/android/settings/development/OemUnlockPreferenceController.java index 243cd3f281f..cadb0bcfd6b 100644 --- a/src/com/android/settings/development/OemUnlockPreferenceController.java +++ b/src/com/android/settings/development/OemUnlockPreferenceController.java @@ -26,10 +26,11 @@ import android.content.res.Resources; import android.os.UserHandle; import android.os.UserManager; import android.service.oemlock.OemLockManager; +import android.telephony.TelephonyManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.telephony.TelephonyManager; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/PictureColorModePreferenceController.java b/src/com/android/settings/development/PictureColorModePreferenceController.java index fe07083e45d..3cf1f4e8bbf 100644 --- a/src/com/android/settings/development/PictureColorModePreferenceController.java +++ b/src/com/android/settings/development/PictureColorModePreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.development; import android.content.Context; + import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/development/PointerLocationPreferenceController.java b/src/com/android/settings/development/PointerLocationPreferenceController.java index 079184c7dd7..0fd0137cb24 100644 --- a/src/com/android/settings/development/PointerLocationPreferenceController.java +++ b/src/com/android/settings/development/PointerLocationPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java b/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java index ba9ce7746d3..52e730ba36a 100644 --- a/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java +++ b/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java @@ -18,11 +18,12 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.ListPreference; -import androidx.preference.Preference; import android.text.TextUtils; import android.view.ThreadedRenderer; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/ResizableActivityPreferenceController.java b/src/com/android/settings/development/ResizableActivityPreferenceController.java index 9ae9216402e..c74e995540d 100644 --- a/src/com/android/settings/development/ResizableActivityPreferenceController.java +++ b/src/com/android/settings/development/ResizableActivityPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/RtlLayoutPreferenceController.java b/src/com/android/settings/development/RtlLayoutPreferenceController.java index a88f16f90bd..97b366a5a6c 100644 --- a/src/com/android/settings/development/RtlLayoutPreferenceController.java +++ b/src/com/android/settings/development/RtlLayoutPreferenceController.java @@ -19,9 +19,10 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.internal.app.LocalePicker; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/SecondaryDisplayPreferenceController.java b/src/com/android/settings/development/SecondaryDisplayPreferenceController.java index 21f9881ec0b..3e1653d8a43 100644 --- a/src/com/android/settings/development/SecondaryDisplayPreferenceController.java +++ b/src/com/android/settings/development/SecondaryDisplayPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; +import android.text.TextUtils; + import androidx.preference.ListPreference; import androidx.preference.Preference; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java b/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java index 8974c0a8ef9..a72c0e05e1a 100644 --- a/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java +++ b/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java @@ -18,8 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/SelectDebugAppPreferenceController.java b/src/com/android/settings/development/SelectDebugAppPreferenceController.java index 823bf2e9fa5..dcc83020803 100644 --- a/src/com/android/settings/development/SelectDebugAppPreferenceController.java +++ b/src/com/android/settings/development/SelectDebugAppPreferenceController.java @@ -25,6 +25,7 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java index f7f5b6ddd14..05ddf3abba8 100644 --- a/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java +++ b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java @@ -20,11 +20,12 @@ import android.content.Context; import android.content.pm.IShortcutService; import android.os.RemoteException; import android.os.ServiceManager; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java b/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java index d0df9c8d3a0..5e0cda82944 100644 --- a/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java +++ b/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java index 4d3fdbf6ca7..fb091b7d473 100644 --- a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java +++ b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java @@ -18,10 +18,11 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.view.View; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; diff --git a/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java index ffd3da27cd1..5dadb6ff6c2 100644 --- a/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java +++ b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java @@ -21,9 +21,10 @@ import android.os.IBinder; import android.os.Parcel; import android.os.RemoteException; import android.os.ServiceManager; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/ShowTapsPreferenceController.java b/src/com/android/settings/development/ShowTapsPreferenceController.java index 87fbf6928b5..25d421ddf2b 100644 --- a/src/com/android/settings/development/ShowTapsPreferenceController.java +++ b/src/com/android/settings/development/ShowTapsPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/SimulateColorSpacePreferenceController.java b/src/com/android/settings/development/SimulateColorSpacePreferenceController.java index ed16b685b78..56fa76d379c 100644 --- a/src/com/android/settings/development/SimulateColorSpacePreferenceController.java +++ b/src/com/android/settings/development/SimulateColorSpacePreferenceController.java @@ -20,10 +20,11 @@ import android.content.ContentResolver; import android.content.Context; import android.content.res.Resources; import android.provider.Settings; +import android.view.accessibility.AccessibilityManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; -import android.view.accessibility.AccessibilityManager; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/StayAwakePreferenceController.java b/src/com/android/settings/development/StayAwakePreferenceController.java index 31eb71aff88..7d67b9e4d07 100644 --- a/src/com/android/settings/development/StayAwakePreferenceController.java +++ b/src/com/android/settings/development/StayAwakePreferenceController.java @@ -23,6 +23,7 @@ import android.net.Uri; import android.os.BatteryManager; import android.os.Handler; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/development/StrictModePreferenceController.java b/src/com/android/settings/development/StrictModePreferenceController.java index 2af301c0d6d..c28e4766219 100644 --- a/src/com/android/settings/development/StrictModePreferenceController.java +++ b/src/com/android/settings/development/StrictModePreferenceController.java @@ -21,10 +21,11 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.StrictMode; import android.os.SystemProperties; +import android.view.IWindowManager; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; -import android.view.IWindowManager; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java b/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java index 7174b457e0b..476cf50ffe6 100644 --- a/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java +++ b/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java @@ -18,8 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java index 72b0bf3a31f..f838a76cfa8 100644 --- a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java +++ b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java b/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java index 6f57f888340..0a8e941ea57 100644 --- a/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java +++ b/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.development; import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; +import android.view.IWindowManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; -import android.view.IWindowManager; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java index c73412dbb35..335a48de82a 100644 --- a/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java +++ b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java index f151134705c..77094e9b354 100644 --- a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java +++ b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java @@ -22,6 +22,7 @@ import android.content.pm.ResolveInfo; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java index 9959f12ce1a..d11fe37c66a 100644 --- a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java +++ b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java @@ -26,10 +26,11 @@ import android.content.Context; import android.content.Intent; import android.os.RemoteException; import android.provider.Settings; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; -import android.text.TextUtils; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/WebViewAppPreferenceController.java b/src/com/android/settings/development/WebViewAppPreferenceController.java index 7796cfda350..fb48cd54ea1 100644 --- a/src/com/android/settings/development/WebViewAppPreferenceController.java +++ b/src/com/android/settings/development/WebViewAppPreferenceController.java @@ -18,11 +18,12 @@ package com.android.settings.development; import android.content.Context; import android.content.pm.PackageInfo; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.webview.WebViewUpdateServiceWrapper; diff --git a/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java b/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java index 9582ebe4ad3..fed07f65436 100644 --- a/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java +++ b/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java index 71ca8f1956d..0236f1585e2 100644 --- a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java +++ b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java index c3c9ca3ec13..de53a2d7146 100644 --- a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java +++ b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.net.wifi.WifiManager; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/WindowAnimationScalePreferenceController.java b/src/com/android/settings/development/WindowAnimationScalePreferenceController.java index 6414372470d..70b2e2de186 100644 --- a/src/com/android/settings/development/WindowAnimationScalePreferenceController.java +++ b/src/com/android/settings/development/WindowAnimationScalePreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.development; import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; +import android.view.IWindowManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; -import android.view.IWindowManager; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/featureflags/FeatureFlagPreference.java b/src/com/android/settings/development/featureflags/FeatureFlagPreference.java index 7dd8f28f825..a8377090e8c 100644 --- a/src/com/android/settings/development/featureflags/FeatureFlagPreference.java +++ b/src/com/android/settings/development/featureflags/FeatureFlagPreference.java @@ -17,9 +17,10 @@ package com.android.settings.development.featureflags; import android.content.Context; -import androidx.preference.SwitchPreference; import android.util.FeatureFlagUtils; +import androidx.preference.SwitchPreference; + public class FeatureFlagPreference extends SwitchPreference { private final String mKey; diff --git a/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java b/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java index 960979c40f1..2acda4ebe77 100644 --- a/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java +++ b/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java @@ -17,9 +17,10 @@ package com.android.settings.development.featureflags; import android.content.Context; -import androidx.preference.PreferenceScreen; import android.util.FeatureFlagUtils; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java b/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java index 71d3d07888e..0362074663a 100644 --- a/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java +++ b/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java @@ -25,11 +25,12 @@ import android.content.pm.ServiceInfo; import android.os.RemoteException; import android.os.ServiceManager; import android.service.quicksettings.TileService; +import android.util.Log; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Log; +import androidx.preference.SwitchPreference; import com.android.internal.statusbar.IStatusBarService; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/development/qstile/DevelopmentTiles.java b/src/com/android/settings/development/qstile/DevelopmentTiles.java index 1094ab9c7bb..165c74e410c 100644 --- a/src/com/android/settings/development/qstile/DevelopmentTiles.java +++ b/src/com/android/settings/development/qstile/DevelopmentTiles.java @@ -25,7 +25,6 @@ import android.os.SystemProperties; import android.provider.Settings; import android.service.quicksettings.Tile; import android.service.quicksettings.TileService; -import androidx.annotation.VisibleForTesting; import android.util.Log; import android.view.IWindowManager; import android.view.ThreadedRenderer; @@ -33,6 +32,8 @@ import android.view.View; import android.view.WindowManagerGlobal; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; + import com.android.internal.app.LocalePicker; import com.android.settingslib.development.SystemPropPoker; diff --git a/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java b/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java index ca2175b4c13..fff1f58940e 100644 --- a/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java +++ b/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.deviceinfo; import android.accounts.Account; import android.content.Context; import android.os.Bundle; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java index 707d660b2c8..aa6fe41d191 100644 --- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java +++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java @@ -25,13 +25,14 @@ import android.content.pm.ResolveInfo; import android.os.Build; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.BidiFormatter; import android.text.TextUtils; import android.util.Pair; import android.widget.Toast; +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; diff --git a/src/com/android/settings/deviceinfo/DeviceInfoSettings.java b/src/com/android/settings/deviceinfo/DeviceInfoSettings.java index 5a4dfc26235..f9665dabdf5 100644 --- a/src/com/android/settings/deviceinfo/DeviceInfoSettings.java +++ b/src/com/android/settings/deviceinfo/DeviceInfoSettings.java @@ -21,9 +21,10 @@ import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.provider.SearchIndexableResource; -import androidx.annotation.VisibleForTesting; import android.telephony.TelephonyManager; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; diff --git a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java index 1fc54cd6755..f4661ba82a9 100644 --- a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java +++ b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.deviceinfo; import android.app.Fragment; import android.content.Context; import android.os.Build; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java index fc89dc19420..5c9e172f922 100644 --- a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java +++ b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java @@ -23,11 +23,10 @@ import android.net.wifi.WifiManager; import android.os.Build; import android.os.Bundle; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.SpannedString; -import com.android.internal.annotations.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.bluetooth.BluetoothLengthDeviceNameFilter; import com.android.settings.core.BasePreferenceController; @@ -35,7 +34,6 @@ import com.android.settings.widget.ValidatedEditTextPreference; import com.android.settings.wifi.tether.WifiDeviceNameTextValidator; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; -import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnCreate; import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState; diff --git a/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java b/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java index 62077ca2b14..1150838dacf 100644 --- a/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java +++ b/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java @@ -17,9 +17,10 @@ package com.android.settings.deviceinfo; import android.content.Context; import android.os.SystemProperties; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java b/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java index 52721821a41..eecf9eed236 100644 --- a/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java +++ b/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.deviceinfo; import android.app.Fragment; import android.content.Context; import android.content.Intent; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.DeviceInfoUtils; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java index 58155af1ca5..8f32ede4c08 100644 --- a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java +++ b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java @@ -21,12 +21,13 @@ import android.app.Dialog; import android.os.Build; import android.os.Bundle; import android.os.SystemProperties; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java b/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java index 1af63975f5d..6ba45b35eeb 100644 --- a/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java +++ b/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java @@ -18,9 +18,8 @@ package com.android.settings.deviceinfo; import android.content.Context; -import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.R; - +import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.deviceinfo.AbstractIpAddressPreferenceController; diff --git a/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java b/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java index c0ae99a1ee5..5c2b6417102 100644 --- a/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java +++ b/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.deviceinfo; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java index 95cd09c3954..8e60b06fee2 100644 --- a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java +++ b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java @@ -17,9 +17,6 @@ package com.android.settings.deviceinfo; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -27,6 +24,10 @@ import android.text.BidiFormatter; import android.text.TextDirectionHeuristics; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.DeviceInfoUtils; diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java index b6d50cef75a..054b7cfda72 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java @@ -18,7 +18,6 @@ package com.android.settings.deviceinfo; import android.app.AlertDialog; import android.app.Dialog; -import android.app.DialogFragment; import android.app.Fragment; import android.content.Context; import android.content.DialogInterface; diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java b/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java index 6047f8cc082..4bc3bccd774 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java @@ -24,7 +24,6 @@ import android.view.MenuInflater; import android.view.MenuItem; import com.android.settings.R; -import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu; import com.android.settingslib.core.lifecycle.events.OnOptionsItemSelected; diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java index 54e0eef4897..a8b24f62c5e 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java @@ -36,10 +36,6 @@ import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; import android.os.storage.VolumeRecord; import android.provider.DocumentsContract; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.text.format.Formatter; import android.text.format.Formatter.BytesResult; @@ -51,6 +47,11 @@ import android.view.MenuItem; import android.view.View; import android.widget.EditText; +import androidx.preference.Preference; +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; diff --git a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java index 5982be68a28..84769744839 100644 --- a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java @@ -28,8 +28,6 @@ import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; import android.os.storage.VolumeRecord; import android.provider.DocumentsContract; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.text.format.Formatter; import android.text.format.Formatter.BytesResult; @@ -37,6 +35,9 @@ import android.view.View; import android.view.ViewGroup; 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; diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java index 5575790c322..b0a6d343d5c 100644 --- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java +++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java @@ -28,10 +28,11 @@ import android.os.UserManager; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; import android.provider.SearchIndexableResource; -import androidx.annotation.VisibleForTesting; import android.util.SparseArray; import android.view.View; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/deviceinfo/StorageItemPreference.java b/src/com/android/settings/deviceinfo/StorageItemPreference.java index 6cf85b1fc20..0766a740b3f 100644 --- a/src/com/android/settings/deviceinfo/StorageItemPreference.java +++ b/src/com/android/settings/deviceinfo/StorageItemPreference.java @@ -18,12 +18,12 @@ package com.android.settings.deviceinfo; import android.content.Context; import android.content.res.Resources; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; -import android.view.View; import android.widget.ProgressBar; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.utils.FileSizeFormatter; diff --git a/src/com/android/settings/deviceinfo/StorageProfileFragment.java b/src/com/android/settings/deviceinfo/StorageProfileFragment.java index 5e66fdd0de7..b17d01fcfc5 100644 --- a/src/com/android/settings/deviceinfo/StorageProfileFragment.java +++ b/src/com/android/settings/deviceinfo/StorageProfileFragment.java @@ -24,9 +24,10 @@ import android.os.UserHandle; import android.os.UserManager; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; -import androidx.annotation.VisibleForTesting; import android.util.SparseArray; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java index 9e4a1e2732b..082a0240261 100644 --- a/src/com/android/settings/deviceinfo/StorageSettings.java +++ b/src/com/android/settings/deviceinfo/StorageSettings.java @@ -35,16 +35,17 @@ import android.os.storage.StorageEventListener; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; import android.os.storage.VolumeRecord; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; import android.text.TextUtils; import android.text.format.Formatter; import android.text.format.Formatter.BytesResult; import android.util.Log; import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; +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; diff --git a/src/com/android/settings/deviceinfo/StorageSummaryPreference.java b/src/com/android/settings/deviceinfo/StorageSummaryPreference.java index 292ee44be16..72b67de1ddd 100644 --- a/src/com/android/settings/deviceinfo/StorageSummaryPreference.java +++ b/src/com/android/settings/deviceinfo/StorageSummaryPreference.java @@ -18,13 +18,14 @@ package com.android.settings.deviceinfo; import android.content.Context; import android.graphics.Color; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.util.MathUtils; import android.view.View; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; public class StorageSummaryPreference extends Preference { diff --git a/src/com/android/settings/deviceinfo/StorageUnmountReceiver.java b/src/com/android/settings/deviceinfo/StorageUnmountReceiver.java index 095cf15af4c..81ac97b21d3 100644 --- a/src/com/android/settings/deviceinfo/StorageUnmountReceiver.java +++ b/src/com/android/settings/deviceinfo/StorageUnmountReceiver.java @@ -16,6 +16,8 @@ package com.android.settings.deviceinfo; +import static com.android.settings.deviceinfo.StorageSettings.TAG; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -25,8 +27,6 @@ import android.util.Log; import com.android.settings.deviceinfo.StorageSettings.UnmountTask; -import static com.android.settings.deviceinfo.StorageSettings.TAG; - public class StorageUnmountReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java index b6466cae985..525c5621a70 100644 --- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java +++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java @@ -23,8 +23,6 @@ import android.graphics.Color; import android.graphics.drawable.Drawable; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.format.Formatter; import android.util.Log; import android.view.View; @@ -32,12 +30,15 @@ import android.view.View.OnClickListener; import android.widget.ImageView; import android.widget.ProgressBar; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.deviceinfo.StorageSettings.UnmountTask; import com.android.settingslib.Utils; -import java.io.IOException; import java.io.File; +import java.io.IOException; /** * Preference line representing a single {@link VolumeInfo}, possibly including diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java index 1f393c5128e..7a2f0c105f3 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java +++ b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java @@ -16,20 +16,20 @@ package com.android.settings.deviceinfo; +import static android.content.Intent.EXTRA_TITLE; +import static android.content.pm.PackageManager.EXTRA_MOVE_ID; + +import static com.android.settings.deviceinfo.StorageSettings.TAG; + import android.content.pm.PackageManager; import android.content.pm.PackageManager.MoveCallback; import android.os.Bundle; import android.os.Handler; import android.util.Log; -import android.view.View; import android.widget.Toast; import com.android.settings.R; -import static android.content.Intent.EXTRA_TITLE; -import static android.content.pm.PackageManager.EXTRA_MOVE_ID; -import static com.android.settings.deviceinfo.StorageSettings.TAG; - public class StorageWizardMoveProgress extends StorageWizardBase { private int mMoveId; diff --git a/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java b/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java index 8375310c107..c7005966c48 100644 --- a/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java +++ b/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java @@ -18,8 +18,8 @@ package com.android.settings.deviceinfo; import android.content.Context; -import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.R; +import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.deviceinfo.AbstractWifiMacAddressPreferenceController; diff --git a/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java index 21663f6820e..0e36d85899a 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java @@ -18,6 +18,7 @@ package com.android.settings.deviceinfo.firmwareversion; import android.content.Context; import android.os.SystemProperties; + import androidx.annotation.VisibleForTesting; import com.android.settings.R; diff --git a/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java index 6dc651abad1..ba4eb7af748 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java @@ -17,9 +17,10 @@ package com.android.settings.deviceinfo.firmwareversion; import android.os.Build; -import androidx.annotation.VisibleForTesting; import android.text.BidiFormatter; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; public class BuildNumberDialogController { diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java index 277024576a8..17415cca573 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java @@ -22,10 +22,11 @@ import android.os.Build; import android.os.SystemClock; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; import android.util.Log; import android.view.View; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java index 785ec595b09..fbf44a15e01 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java @@ -19,9 +19,10 @@ package com.android.settings.deviceinfo.firmwareversion; import android.app.Fragment; import android.content.Context; import android.os.Build; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java index cf8ee61090e..d72d5f62e78 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java @@ -19,11 +19,12 @@ package com.android.settings.deviceinfo.firmwareversion; import android.content.Context; import android.content.Intent; import android.net.Uri; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; import android.view.View; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settingslib.DeviceInfoUtils; import com.android.settingslib.wrapper.PackageManagerWrapper; diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java index 71da4a3d5db..dc4ba2fb293 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java @@ -18,8 +18,6 @@ package com.android.settings.deviceinfo.imei; import android.content.Context; import android.content.res.Resources; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -29,6 +27,9 @@ import android.text.Spanned; import android.text.TextUtils; import android.text.style.TtsSpan; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + import com.android.internal.telephony.PhoneConstants; import com.android.settings.R; diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java index 3cc90e48293..084d44f424e 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java @@ -21,13 +21,14 @@ import android.app.Dialog; import android.app.Fragment; import android.app.FragmentManager; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java index d673a280274..8d87843323d 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java @@ -20,10 +20,11 @@ import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA; import android.app.Fragment; import android.content.Context; +import android.telephony.TelephonyManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.telephony.TelephonyManager; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java index 114e4e449aa..9cea62d1e31 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java @@ -30,8 +30,6 @@ import android.content.res.Resources; import android.os.Bundle; import android.os.PersistableBundle; import android.os.UserHandle; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; import android.telephony.CarrierConfigManager; import android.telephony.CellBroadcastMessage; import android.telephony.PhoneStateListener; @@ -46,6 +44,9 @@ 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.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java index 3f714712a08..888dc25f5c6 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java @@ -18,13 +18,14 @@ package com.android.settings.deviceinfo.simstatus; import android.app.Fragment; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController; diff --git a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java index 92078036c17..741ad7bb6af 100644 --- a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java @@ -21,6 +21,7 @@ import android.app.FragmentManager; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java b/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java index f07af5e56e0..e6d9a724d94 100644 --- a/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java +++ b/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java @@ -19,9 +19,10 @@ package com.android.settings.deviceinfo.storage; import android.content.Context; import android.content.SharedPreferences; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.util.SparseArray; +import androidx.annotation.VisibleForTesting; + import com.android.settingslib.applications.StorageStatsSource; import com.android.settingslib.deviceinfo.PrivateStorageInfo; diff --git a/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java b/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java index 1eccb67f548..ee9fad6d52a 100644 --- a/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java +++ b/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java @@ -20,12 +20,13 @@ import android.content.Context; import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; import android.os.UserManager; +import android.util.SparseArray; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; -import android.util.SparseArray; import com.android.settings.Utils; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java index 6ae4a6f0b20..e9e8c4f8277 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java @@ -26,11 +26,12 @@ import android.net.TrafficStats; import android.os.Bundle; import android.os.UserHandle; import android.os.storage.VolumeInfo; +import android.util.Log; +import android.util.SparseArray; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Log; -import android.util.SparseArray; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java index 813261f50b3..a025d8c4daf 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java +++ b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java @@ -20,28 +20,20 @@ import android.content.Context; import android.content.Intent; import android.graphics.Typeface; import android.os.storage.StorageManager; -import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; -import android.text.SpannableString; -import android.text.Spanned; import android.text.TextPaint; -import android.text.TextUtils; import android.text.style.StyleSpan; import android.util.AttributeSet; -import android.util.MathUtils; import android.view.View; import android.widget.Button; -import android.widget.TextView; + +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; -import java.text.NumberFormat; -import java.util.Locale; - /** * StorageSummaryDonutPreference is a preference which summarizes the used and remaining storage left * on a given storage volume. It is visualized with a donut graphing the % used. diff --git a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java index f4c33be5ae3..1a5152ed400 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java @@ -18,11 +18,12 @@ package com.android.settings.deviceinfo.storage; import android.content.Context; import android.os.storage.VolumeInfo; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.text.format.Formatter; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/deviceinfo/storage/UserIconLoader.java b/src/com/android/settings/deviceinfo/storage/UserIconLoader.java index d1c29dfe38a..e85bf08a5ea 100644 --- a/src/com/android/settings/deviceinfo/storage/UserIconLoader.java +++ b/src/com/android/settings/deviceinfo/storage/UserIconLoader.java @@ -20,7 +20,6 @@ import android.content.Context; import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; import android.os.UserManager; -import android.util.Log; import android.util.SparseArray; import com.android.internal.util.Preconditions; diff --git a/src/com/android/settings/deviceinfo/storage/UserProfileController.java b/src/com/android/settings/deviceinfo/storage/UserProfileController.java index 1778d13f325..afc68b5d6a7 100644 --- a/src/com/android/settings/deviceinfo/storage/UserProfileController.java +++ b/src/com/android/settings/deviceinfo/storage/UserProfileController.java @@ -21,9 +21,10 @@ import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.storage.VolumeInfo; +import android.util.SparseArray; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.SparseArray; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.util.Preconditions; diff --git a/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java b/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java index a9b047c58b4..3d1e9b805fe 100644 --- a/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java +++ b/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java @@ -19,6 +19,7 @@ package com.android.settings.deviceinfo.storage; import android.app.usage.StorageStatsManager; import android.content.Context; import android.os.storage.VolumeInfo; + import androidx.annotation.VisibleForTesting; import com.android.settingslib.deviceinfo.PrivateStorageInfo; diff --git a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java index 0da5dbeb768..58054b501af 100644 --- a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java +++ b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java @@ -21,9 +21,10 @@ import android.content.Context; import android.content.Intent; import android.os.UserHandle; import android.provider.Settings; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.text.TextUtils; import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; diff --git a/src/com/android/settings/display/AmbientDisplayPreferenceController.java b/src/com/android/settings/display/AmbientDisplayPreferenceController.java index f429b0dfe5a..6638282343b 100644 --- a/src/com/android/settings/display/AmbientDisplayPreferenceController.java +++ b/src/com/android/settings/display/AmbientDisplayPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.display; import android.content.Context; import android.os.UserHandle; + import androidx.preference.Preference; import com.android.internal.hardware.AmbientDisplayConfiguration; diff --git a/src/com/android/settings/display/AmbientDisplaySettings.java b/src/com/android/settings/display/AmbientDisplaySettings.java index 8745e3ff180..01a5539e736 100644 --- a/src/com/android/settings/display/AmbientDisplaySettings.java +++ b/src/com/android/settings/display/AmbientDisplaySettings.java @@ -17,7 +17,6 @@ package com.android.settings.display; import android.content.Context; -import android.os.UserHandle; import android.provider.SearchIndexableResource; import com.android.internal.hardware.AmbientDisplayConfiguration; @@ -26,12 +25,8 @@ import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.gestures.DoubleTapScreenPreferenceController; import com.android.settings.gestures.PickupGesturePreferenceController; -import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; -import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; -import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/display/AppGridView.java b/src/com/android/settings/display/AppGridView.java index 00275375280..effc6af8bb7 100644 --- a/src/com/android/settings/display/AppGridView.java +++ b/src/com/android/settings/display/AppGridView.java @@ -22,7 +22,6 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.graphics.drawable.Drawable; import android.os.UserHandle; -import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.util.IconDrawableFactory; import android.view.View; @@ -31,6 +30,8 @@ import android.widget.ArrayAdapter; import android.widget.GridView; import android.widget.ImageView; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import java.util.ArrayList; diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/src/com/android/settings/display/AutoBrightnessPreferenceController.java index 7c93d285908..027d4c45407 100644 --- a/src/com/android/settings/display/AutoBrightnessPreferenceController.java +++ b/src/com/android/settings/display/AutoBrightnessPreferenceController.java @@ -13,21 +13,21 @@ */ package com.android.settings.display; +import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE; +import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC; +import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL; + import android.content.Context; import android.content.Intent; import android.provider.Settings; import android.text.TextUtils; import com.android.settings.DisplaySettings; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.InlineSwitchPayload; import com.android.settings.search.ResultPayload; -import com.android.settings.R; - -import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE; -import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC; -import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL; public class AutoBrightnessPreferenceController extends TogglePreferenceController { diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java index 6bdf75aebf5..c852c01f380 100644 --- a/src/com/android/settings/display/AutoRotatePreferenceController.java +++ b/src/com/android/settings/display/AutoRotatePreferenceController.java @@ -14,9 +14,10 @@ package com.android.settings.display; import android.content.Context; -import androidx.preference.Preference; 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; diff --git a/src/com/android/settings/display/BatteryPercentagePreferenceController.java b/src/com/android/settings/display/BatteryPercentagePreferenceController.java index 632e3390703..e6a62bc5016 100644 --- a/src/com/android/settings/display/BatteryPercentagePreferenceController.java +++ b/src/com/android/settings/display/BatteryPercentagePreferenceController.java @@ -15,16 +15,17 @@ */ package com.android.settings.display; +import static android.provider.Settings.System.SHOW_BATTERY_PERCENT; + import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; -import static android.provider.Settings.System.SHOW_BATTERY_PERCENT; - /** * A controller to manage the switch for showing battery percentage in the status bar. */ diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java index be79f66b556..05f43f650ac 100644 --- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java +++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java @@ -28,10 +28,11 @@ import android.os.ServiceManager; import android.provider.Settings; import android.provider.Settings.System; import android.service.vr.IVrManager; +import android.util.Log; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Log; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/display/CameraGesturePreferenceController.java b/src/com/android/settings/display/CameraGesturePreferenceController.java index 9b1b2c296c4..8e72a55227b 100644 --- a/src/com/android/settings/display/CameraGesturePreferenceController.java +++ b/src/com/android/settings/display/CameraGesturePreferenceController.java @@ -13,17 +13,18 @@ */ package com.android.settings.display; +import static android.provider.Settings.Secure.CAMERA_GESTURE_DISABLED; + import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; -import static android.provider.Settings.Secure.CAMERA_GESTURE_DISABLED; - public class CameraGesturePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/ColorModePreferenceFragment.java b/src/com/android/settings/display/ColorModePreferenceFragment.java index ab17c72051b..e6ee77d7640 100644 --- a/src/com/android/settings/display/ColorModePreferenceFragment.java +++ b/src/com/android/settings/display/ColorModePreferenceFragment.java @@ -15,14 +15,14 @@ package com.android.settings.display; import android.content.Context; import android.graphics.drawable.Drawable; + 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.applications.LayoutPreference; import com.android.settings.R; +import com.android.settings.applications.LayoutPreference; import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settingslib.widget.CandidateInfo; diff --git a/src/com/android/settings/display/ConversationMessageView.java b/src/com/android/settings/display/ConversationMessageView.java index b054444fe57..22e1f205509 100644 --- a/src/com/android/settings/display/ConversationMessageView.java +++ b/src/com/android/settings/display/ConversationMessageView.java @@ -29,6 +29,7 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.TextView; + import com.android.settings.R; /** diff --git a/src/com/android/settings/display/DensityPreference.java b/src/com/android/settings/display/DensityPreference.java index 581a3ee444e..e55e578996e 100644 --- a/src/com/android/settings/display/DensityPreference.java +++ b/src/com/android/settings/display/DensityPreference.java @@ -26,8 +26,8 @@ import android.view.View; import android.widget.EditText; import com.android.settings.R; -import com.android.settingslib.CustomEditTextPreference; import com.android.settings.Utils; +import com.android.settingslib.CustomEditTextPreference; import com.android.settingslib.display.DisplayDensityUtils; import java.text.NumberFormat; diff --git a/src/com/android/settings/display/LiftToWakePreferenceController.java b/src/com/android/settings/display/LiftToWakePreferenceController.java index 42feda2c960..d12b7c4c15d 100644 --- a/src/com/android/settings/display/LiftToWakePreferenceController.java +++ b/src/com/android/settings/display/LiftToWakePreferenceController.java @@ -13,18 +13,19 @@ */ package com.android.settings.display; +import static android.provider.Settings.Secure.WAKE_GESTURE_ENABLED; + import android.content.Context; import android.hardware.Sensor; import android.hardware.SensorManager; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; -import static android.provider.Settings.Secure.WAKE_GESTURE_ENABLED; - public class LiftToWakePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java index ffc73860c29..6421ebdbd4e 100644 --- a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java @@ -17,12 +17,14 @@ package com.android.settings.display; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; + +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.app.ColorDisplayController; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java b/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java index bb42c857a7e..cfe17915fd6 100644 --- a/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java +++ b/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java @@ -17,9 +17,11 @@ package com.android.settings.display; import android.content.Context; + import androidx.preference.DropDownPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; + import com.android.internal.app.ColorDisplayController; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java index 1eebb6be5ae..e2abe1b24c8 100644 --- a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java +++ b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java @@ -17,7 +17,9 @@ package com.android.settings.display; import android.content.Context; + import androidx.preference.Preference; + 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 19297b82f32..255003c7011 100644 --- a/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java +++ b/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java @@ -17,7 +17,9 @@ package com.android.settings.display; import android.content.Context; + import androidx.preference.Preference; + 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 2075cfca322..bb598590bc5 100644 --- a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java @@ -17,7 +17,9 @@ package com.android.settings.display; import android.content.Context; + import androidx.preference.Preference; + import com.android.internal.app.ColorDisplayController; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java index 9f215d9b599..db053a596ff 100644 --- a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java @@ -17,9 +17,10 @@ package com.android.settings.display; import android.content.Context; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.internal.app.ColorDisplayController; import com.android.settings.core.SliderPreferenceController; diff --git a/src/com/android/settings/display/NightDisplayPreference.java b/src/com/android/settings/display/NightDisplayPreference.java index a1608d75e09..a84ba588816 100644 --- a/src/com/android/settings/display/NightDisplayPreference.java +++ b/src/com/android/settings/display/NightDisplayPreference.java @@ -15,9 +15,10 @@ package com.android.settings.display; import android.content.Context; -import androidx.preference.SwitchPreference; import android.util.AttributeSet; +import androidx.preference.SwitchPreference; + import com.android.internal.app.ColorDisplayController; import java.time.LocalTime; diff --git a/src/com/android/settings/display/NightDisplayPreferenceController.java b/src/com/android/settings/display/NightDisplayPreferenceController.java index 0bbab935f8a..3cb57e0272b 100644 --- a/src/com/android/settings/display/NightDisplayPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayPreferenceController.java @@ -16,9 +16,9 @@ package com.android.settings.display; import android.content.Context; import com.android.internal.app.ColorDisplayController; +import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settings.R; public class NightDisplayPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java index 848ddd51ae6..564d9d3edf5 100644 --- a/src/com/android/settings/display/NightDisplaySettings.java +++ b/src/com/android/settings/display/NightDisplaySettings.java @@ -21,6 +21,7 @@ import android.app.TimePickerDialog; import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; + import androidx.preference.Preference; import com.android.internal.app.ColorDisplayController; diff --git a/src/com/android/settings/display/NightModePreferenceController.java b/src/com/android/settings/display/NightModePreferenceController.java index 41620ea4704..5846a658346 100644 --- a/src/com/android/settings/display/NightModePreferenceController.java +++ b/src/com/android/settings/display/NightModePreferenceController.java @@ -17,10 +17,11 @@ import static android.content.Context.UI_MODE_SERVICE; import android.app.UiModeManager; import android.content.Context; +import android.util.Log; + import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Log; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/display/ScreenSaverPreferenceController.java b/src/com/android/settings/display/ScreenSaverPreferenceController.java index ae44bf3e182..c1b0b4e9eb6 100644 --- a/src/com/android/settings/display/ScreenSaverPreferenceController.java +++ b/src/com/android/settings/display/ScreenSaverPreferenceController.java @@ -14,6 +14,7 @@ package com.android.settings.display; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/display/ScreenZoomPreference.java b/src/com/android/settings/display/ScreenZoomPreference.java index 8451a2d4e3f..f47d7da4384 100644 --- a/src/com/android/settings/display/ScreenZoomPreference.java +++ b/src/com/android/settings/display/ScreenZoomPreference.java @@ -17,11 +17,12 @@ package com.android.settings.display; import android.content.Context; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.AttributeSet; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.Preference; + import com.android.settingslib.display.DisplayDensityUtils; /** diff --git a/src/com/android/settings/display/ShowOperatorNamePreferenceController.java b/src/com/android/settings/display/ShowOperatorNamePreferenceController.java index cdb89fb4e11..40eaad330d0 100644 --- a/src/com/android/settings/display/ShowOperatorNamePreferenceController.java +++ b/src/com/android/settings/display/ShowOperatorNamePreferenceController.java @@ -15,8 +15,9 @@ package com.android.settings.display; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/display/SystemUiThemePreferenceController.java b/src/com/android/settings/display/SystemUiThemePreferenceController.java index 3419ece9dd6..1660fc56d8b 100644 --- a/src/com/android/settings/display/SystemUiThemePreferenceController.java +++ b/src/com/android/settings/display/SystemUiThemePreferenceController.java @@ -20,14 +20,13 @@ import static android.provider.Settings.Secure.THEME_MODE; import android.content.Context; import android.provider.Settings; +import android.util.FeatureFlagUtils; + import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.FeatureFlagUtils; import com.android.settings.core.BasePreferenceController; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; /** * Setting where user can pick if SystemUI will be light, dark or try to match diff --git a/src/com/android/settings/display/TapToWakePreferenceController.java b/src/com/android/settings/display/TapToWakePreferenceController.java index ff149ba838a..5c2d97530da 100644 --- a/src/com/android/settings/display/TapToWakePreferenceController.java +++ b/src/com/android/settings/display/TapToWakePreferenceController.java @@ -15,8 +15,9 @@ package com.android.settings.display; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/display/ThemePreferenceController.java b/src/com/android/settings/display/ThemePreferenceController.java index abecc421e13..6fc4b08bf00 100644 --- a/src/com/android/settings/display/ThemePreferenceController.java +++ b/src/com/android/settings/display/ThemePreferenceController.java @@ -24,10 +24,11 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/display/TimeoutPreferenceController.java b/src/com/android/settings/display/TimeoutPreferenceController.java index b2a638ecdeb..763ef4e089c 100644 --- a/src/com/android/settings/display/TimeoutPreferenceController.java +++ b/src/com/android/settings/display/TimeoutPreferenceController.java @@ -20,9 +20,10 @@ import android.content.Context; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import androidx.preference.Preference; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.TimeoutListPreference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/display/VrDisplayPreferenceController.java b/src/com/android/settings/display/VrDisplayPreferenceController.java index 9ff2861daed..6fcb5b0bc17 100644 --- a/src/com/android/settings/display/VrDisplayPreferenceController.java +++ b/src/com/android/settings/display/VrDisplayPreferenceController.java @@ -17,6 +17,7 @@ import android.app.ActivityManager; import android.content.Context; import android.content.pm.PackageManager; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/display/WallpaperPreferenceController.java b/src/com/android/settings/display/WallpaperPreferenceController.java index 3c0e9476d8b..8e290046ef6 100644 --- a/src/com/android/settings/display/WallpaperPreferenceController.java +++ b/src/com/android/settings/display/WallpaperPreferenceController.java @@ -13,24 +13,25 @@ */ package com.android.settings.display; +import static android.os.UserManager.DISALLOW_SET_WALLPAPER; + import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.UserHandle; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.AbstractPreferenceController; -import static android.os.UserManager.DISALLOW_SET_WALLPAPER; - import java.util.List; public class WallpaperPreferenceController extends AbstractPreferenceController implements diff --git a/src/com/android/settings/dream/CurrentDreamPicker.java b/src/com/android/settings/dream/CurrentDreamPicker.java index 3ebce1c1d54..d33a1d9e25f 100644 --- a/src/com/android/settings/dream/CurrentDreamPicker.java +++ b/src/com/android/settings/dream/CurrentDreamPicker.java @@ -19,12 +19,14 @@ package com.android.settings.dream; 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; import com.android.settingslib.dream.DreamBackend.DreamInfo; import com.android.settingslib.widget.CandidateInfo; + import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/com/android/settings/dream/CurrentDreamPreferenceController.java b/src/com/android/settings/dream/CurrentDreamPreferenceController.java index fe33365b2bd..80f9f77fa84 100644 --- a/src/com/android/settings/dream/CurrentDreamPreferenceController.java +++ b/src/com/android/settings/dream/CurrentDreamPreferenceController.java @@ -17,12 +17,15 @@ package com.android.settings.dream; import android.content.Context; + import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.widget.GearPreference; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.dream.DreamBackend.DreamInfo; + import java.util.Optional; public class CurrentDreamPreferenceController extends AbstractPreferenceController implements diff --git a/src/com/android/settings/dream/DreamSettings.java b/src/com/android/settings/dream/DreamSettings.java index 73762bd7cdf..ebf8e989077 100644 --- a/src/com/android/settings/dream/DreamSettings.java +++ b/src/com/android/settings/dream/DreamSettings.java @@ -23,6 +23,7 @@ import static com.android.settingslib.dream.DreamBackend.WHILE_DOCKED; import android.content.Context; import android.provider.SearchIndexableResource; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/dream/StartNowPreferenceController.java b/src/com/android/settings/dream/StartNowPreferenceController.java index 0a6c1b67464..5519a0efc49 100644 --- a/src/com/android/settings/dream/StartNowPreferenceController.java +++ b/src/com/android/settings/dream/StartNowPreferenceController.java @@ -17,9 +17,11 @@ package com.android.settings.dream; import android.content.Context; +import android.widget.Button; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.widget.Button; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/dream/WhenToDreamPicker.java b/src/com/android/settings/dream/WhenToDreamPicker.java index f6f89a89f8b..4c69b360bc0 100644 --- a/src/com/android/settings/dream/WhenToDreamPicker.java +++ b/src/com/android/settings/dream/WhenToDreamPicker.java @@ -18,11 +18,13 @@ package com.android.settings.dream; 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; import com.android.settingslib.widget.CandidateInfo; + import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/dream/WhenToDreamPreferenceController.java b/src/com/android/settings/dream/WhenToDreamPreferenceController.java index 702812e7fda..4108e850538 100644 --- a/src/com/android/settings/dream/WhenToDreamPreferenceController.java +++ b/src/com/android/settings/dream/WhenToDreamPreferenceController.java @@ -17,7 +17,9 @@ package com.android.settings.dream; import android.content.Context; + import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.dream.DreamBackend; diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java index 026b79f0fd9..4047e8a4d35 100644 --- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java +++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java @@ -26,7 +26,6 @@ import android.graphics.drawable.Drawable; import android.os.Process; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; import android.util.IconDrawableFactory; import android.view.LayoutInflater; import android.view.View; @@ -34,6 +33,8 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.android.settings.DeviceAdminAdd; import com.android.settings.R; import com.android.settings.Settings; diff --git a/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java index 520c436662e..1c7ff620c3c 100644 --- a/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java @@ -15,9 +15,10 @@ package com.android.settings.enterprise; import android.content.Context; -import androidx.preference.Preference; import android.text.format.DateUtils; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java index 93ed1027c25..86d08cb674d 100644 --- a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java @@ -16,6 +16,7 @@ package com.android.settings.enterprise; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java index 7b6d5df3fde..696561bad8c 100644 --- a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java +++ b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java @@ -14,6 +14,7 @@ package com.android.settings.enterprise; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java index 07a39e3a90c..3170dac364d 100644 --- a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java +++ b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.enterprise; import android.content.Context; import android.content.pm.PackageManager; +import android.util.IconDrawableFactory; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.IconDrawableFactory; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.ApplicationFeatureProvider; diff --git a/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java index 6e81482e100..45170b3842f 100644 --- a/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java +++ b/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java @@ -15,6 +15,7 @@ package com.android.settings.enterprise; import android.content.Context; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java b/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java index 2d3f41a6d4f..1bfe74724f3 100644 --- a/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java +++ b/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java @@ -15,6 +15,7 @@ package com.android.settings.enterprise; import android.content.Context; + import androidx.annotation.VisibleForTesting; public class CaCertsManagedProfilePreferenceController extends CaCertsPreferenceControllerBase { diff --git a/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java b/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java index 4220ccc5469..c7dde5cc462 100644 --- a/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java @@ -15,6 +15,7 @@ package com.android.settings.enterprise; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java index 9e8574fcfb4..9bd4279db3f 100644 --- a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java @@ -14,6 +14,7 @@ package com.android.settings.enterprise; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java index e0c287df9e7..b07eb911143 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java @@ -14,6 +14,7 @@ package com.android.settings.enterprise; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java index 876d706d4af..e3136f4a5c1 100644 --- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java @@ -21,6 +21,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.UserInfo; import android.os.UserHandle; + import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java index 63a552d0ac2..b2f9459d8a3 100644 --- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.enterprise; import android.content.Context; import android.os.UserHandle; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java index 2a2a94e7040..322589ea3f9 100644 --- a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java @@ -15,6 +15,7 @@ package com.android.settings.enterprise; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/ImePreferenceController.java b/src/com/android/settings/enterprise/ImePreferenceController.java index fa4e7aa1a9a..51a24a27620 100644 --- a/src/com/android/settings/enterprise/ImePreferenceController.java +++ b/src/com/android/settings/enterprise/ImePreferenceController.java @@ -15,6 +15,7 @@ package com.android.settings.enterprise; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java b/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java index e4f2e76f7d1..832e2ba8ce5 100644 --- a/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java +++ b/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java @@ -14,6 +14,7 @@ package com.android.settings.enterprise; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java index f3c14865590..b87e61f8481 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java @@ -17,9 +17,7 @@ package com.android.settings.fingerprint; import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; -import android.animation.ValueAnimator; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java index 95a534cdd42..4800a4fd48b 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java @@ -20,10 +20,11 @@ import android.content.Intent; import android.hardware.fingerprint.FingerprintManager; import android.os.Bundle; import android.os.UserHandle; -import androidx.annotation.Nullable; import android.view.View; import android.widget.Button; +import androidx.annotation.Nullable; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java b/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java index 226d7185fb4..bca871343a2 100644 --- a/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java +++ b/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java @@ -24,12 +24,13 @@ import android.media.MediaPlayer; import android.media.MediaPlayer.OnInfoListener; import android.media.MediaPlayer.OnPreparedListener; import android.net.Uri; -import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.view.Surface; import android.view.TextureView; import android.view.View; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; /** diff --git a/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java b/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java index 7caca3fff57..ce679b66488 100644 --- a/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java +++ b/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java @@ -17,17 +17,18 @@ package com.android.settings.fingerprint; import android.annotation.Nullable; -import android.content.Context; import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; import android.os.Bundle; -import com.android.settings.core.InstrumentedFragment; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import android.os.UserHandle; -import java.util.Queue; -import java.util.LinkedList; import android.util.Log; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settings.core.InstrumentedFragment; + +import java.util.LinkedList; +import java.util.Queue; + /** * Sidecar fragment to handle the state around fingerprint removal. */ diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java index ed691895e84..8fccd66cf2b 100644 --- a/src/com/android/settings/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/fingerprint/FingerprintSettings.java @@ -31,12 +31,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -44,6 +38,13 @@ import android.view.WindowManager; import android.widget.EditText; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +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; diff --git a/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java b/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java index 519f116a048..aa1ddfb948e 100644 --- a/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java +++ b/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java @@ -22,6 +22,7 @@ import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; import android.os.UserHandle; import android.os.UserManager; + import androidx.preference.Preference; import com.android.internal.widget.LockPatternUtils; diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java index 78dcb80afc0..fbf4309f25b 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java +++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java @@ -24,6 +24,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; + import androidx.annotation.NonNull; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java index badcb535471..de4867f572a 100644 --- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java @@ -29,12 +29,13 @@ import android.os.BatteryStats; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; 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; diff --git a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java index a2ba9a96181..06f35266edd 100644 --- a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java +++ b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java @@ -37,12 +37,13 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceScreen; import android.util.Log; import android.view.View; import android.webkit.IWebViewUpdateService; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.DeviceAdminAdd; import com.android.settings.R; diff --git a/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java b/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java index 7527db3acb1..26fd3985156 100644 --- a/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java +++ b/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java @@ -17,8 +17,9 @@ package com.android.settings.fuelgauge; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java index cd384f1fa24..7f74d9e439b 100644 --- a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java @@ -18,6 +18,7 @@ import android.app.AppOpsManager; import android.app.admin.DevicePolicyManager; import android.content.Context; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java index 83b0984c7e9..6848ea88b08 100644 --- a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java @@ -27,24 +27,23 @@ import android.os.Message; import android.os.Process; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.ArrayMap; -import android.util.FeatureFlagUtils; import android.util.Log; import android.util.SparseArray; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.internal.os.BatterySipper; import com.android.internal.os.BatterySipper.DrainType; import com.android.internal.os.BatteryStatsHelper; import com.android.internal.os.PowerProfile; import com.android.settings.R; import com.android.settings.SettingsActivity; -import com.android.settings.core.FeatureFlags; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.fuelgauge.anomaly.Anomaly; diff --git a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java index f07389de53b..b5c39a1f697 100644 --- a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java +++ b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java @@ -21,11 +21,11 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.PowerManager; + import androidx.annotation.IntDef; import androidx.annotation.VisibleForTesting; import com.android.settings.Utils; -import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/com/android/settings/fuelgauge/BatteryCellParser.java b/src/com/android/settings/fuelgauge/BatteryCellParser.java index 2b398778ca3..9139084d52e 100644 --- a/src/com/android/settings/fuelgauge/BatteryCellParser.java +++ b/src/com/android/settings/fuelgauge/BatteryCellParser.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge; import android.os.BatteryStats.HistoryItem; import android.telephony.ServiceState; import android.util.SparseIntArray; + import com.android.settings.Utils; import com.android.settings.fuelgauge.BatteryActiveView.BatteryActiveProvider; diff --git a/src/com/android/settings/fuelgauge/BatteryFlagParser.java b/src/com/android/settings/fuelgauge/BatteryFlagParser.java index d4f3fb20fd4..e16d5e7633f 100644 --- a/src/com/android/settings/fuelgauge/BatteryFlagParser.java +++ b/src/com/android/settings/fuelgauge/BatteryFlagParser.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge; import android.os.BatteryStats.HistoryItem; import android.util.SparseBooleanArray; import android.util.SparseIntArray; + import com.android.settings.fuelgauge.BatteryActiveView.BatteryActiveProvider; public class BatteryFlagParser implements BatteryInfo.BatteryDataParser, BatteryActiveProvider { diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java index 7038fade345..1695e40b901 100644 --- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java @@ -22,10 +22,11 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.BatteryManager; +import android.widget.TextView; + import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; -import android.widget.TextView; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java index 3661467887b..f7d62473dc4 100644 --- a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java +++ b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java @@ -25,6 +25,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java index 6ef09570b6e..4193cb9a131 100644 --- a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java +++ b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java @@ -17,12 +17,14 @@ package com.android.settings.fuelgauge; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.widget.TextView; + +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; import com.android.settings.graph.UsageView; diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java index 9afaabad395..7d0c7989602 100644 --- a/src/com/android/settings/fuelgauge/BatteryInfo.java +++ b/src/com/android/settings/fuelgauge/BatteryInfo.java @@ -24,10 +24,11 @@ import android.os.BatteryStats; import android.os.BatteryStats.HistoryItem; import android.os.Bundle; import android.os.SystemClock; -import androidx.annotation.WorkerThread; import android.text.format.Formatter; import android.util.SparseIntArray; +import androidx.annotation.WorkerThread; + import com.android.internal.os.BatteryStatsHelper; import com.android.settings.Utils; import com.android.settings.graph.UsageView; diff --git a/src/com/android/settings/fuelgauge/BatteryInfoLoader.java b/src/com/android/settings/fuelgauge/BatteryInfoLoader.java index c60f42314f7..22efaf6dec7 100644 --- a/src/com/android/settings/fuelgauge/BatteryInfoLoader.java +++ b/src/com/android/settings/fuelgauge/BatteryInfoLoader.java @@ -17,11 +17,10 @@ package com.android.settings.fuelgauge; import android.content.Context; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.os.BatteryStatsHelper; import com.android.settingslib.utils.AsyncLoader; -import com.android.internal.annotations.VisibleForTesting; - /** * Loader that can be used by classes to load BatteryInfo in a background thread. This loader will * automatically grab enhanced battery estimates if available or fall back to the system estimate diff --git a/src/com/android/settings/fuelgauge/BatteryMeterView.java b/src/com/android/settings/fuelgauge/BatteryMeterView.java index 0ad3724c906..5ad24003096 100644 --- a/src/com/android/settings/fuelgauge/BatteryMeterView.java +++ b/src/com/android/settings/fuelgauge/BatteryMeterView.java @@ -22,10 +22,11 @@ import android.graphics.Color; import android.graphics.ColorFilter; import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; -import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.widget.ImageView; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.graph.BatteryMeterDrawableBase; diff --git a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java index b010998befd..6d2f1247027 100644 --- a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java @@ -15,6 +15,7 @@ package com.android.settings.fuelgauge; import android.os.Bundle; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/fuelgauge/BatterySaverController.java b/src/com/android/settings/fuelgauge/BatterySaverController.java index 8b32a9cca1b..2b4e91508dd 100644 --- a/src/com/android/settings/fuelgauge/BatterySaverController.java +++ b/src/com/android/settings/fuelgauge/BatterySaverController.java @@ -21,6 +21,7 @@ import android.os.Handler; import android.os.Looper; import android.os.PowerManager; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java b/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java index addd30945c5..c71478339ec 100644 --- a/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java +++ b/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java @@ -17,9 +17,8 @@ package com.android.settings.fuelgauge; import android.content.Context; -import android.os.BatteryStats; -import android.os.Bundle; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; import com.android.internal.os.BatteryStatsHelper; diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java index 4a3e6d42e88..68cdf6c346e 100644 --- a/src/com/android/settings/fuelgauge/BatteryUtils.java +++ b/src/com/android/settings/fuelgauge/BatteryUtils.java @@ -24,21 +24,21 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.BatteryStats; -import android.os.Bundle; import android.os.Build; +import android.os.Bundle; import android.os.Process; import android.os.SystemClock; import android.os.UserHandle; import android.os.UserManager; +import android.text.format.DateUtils; +import android.util.Log; +import android.util.SparseLongArray; + import androidx.annotation.IntDef; import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.annotation.VisibleForTesting; import androidx.annotation.WorkerThread; -import android.text.TextUtils; -import android.text.format.DateUtils; -import android.util.Log; -import android.util.SparseLongArray; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; @@ -48,7 +48,6 @@ import com.android.settings.fuelgauge.anomaly.Anomaly; import com.android.settings.fuelgauge.batterytip.AnomalyInfo; import com.android.settings.fuelgauge.batterytip.StatsManagerConfig; import com.android.settings.overlay.FeatureFactory; - import com.android.settingslib.fuelgauge.PowerWhitelistBackend; import com.android.settingslib.utils.PowerUtil; diff --git a/src/com/android/settings/fuelgauge/ButtonActionDialogFragment.java b/src/com/android/settings/fuelgauge/ButtonActionDialogFragment.java index f4784a97824..3a6e4eb01da 100644 --- a/src/com/android/settings/fuelgauge/ButtonActionDialogFragment.java +++ b/src/com/android/settings/fuelgauge/ButtonActionDialogFragment.java @@ -1,11 +1,11 @@ package com.android.settings.fuelgauge; -import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; + import androidx.annotation.IntDef; import androidx.annotation.VisibleForTesting; diff --git a/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java b/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java index 784902fca79..f58ad960818 100644 --- a/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java +++ b/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java @@ -20,10 +20,12 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.BatteryStats; import android.os.SystemClock; + import com.android.internal.os.BatteryStatsHelper; import com.android.settings.overlay.FeatureFactory; -import com.android.settingslib.utils.PowerUtil; import com.android.settingslib.utils.AsyncLoader; +import com.android.settingslib.utils.PowerUtil; + import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/fuelgauge/InactiveApps.java b/src/com/android/settings/fuelgauge/InactiveApps.java index f93cffc1f4b..cb419ca253b 100644 --- a/src/com/android/settings/fuelgauge/InactiveApps.java +++ b/src/com/android/settings/fuelgauge/InactiveApps.java @@ -30,15 +30,14 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.os.Bundle; + import androidx.preference.ListPreference; import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceGroup; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.widget.RadioButtonPreference; import java.util.List; diff --git a/src/com/android/settings/fuelgauge/PowerGaugePreference.java b/src/com/android/settings/fuelgauge/PowerGaugePreference.java index 95ff45c9228..a2ceb67cab7 100644 --- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java +++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java @@ -19,10 +19,11 @@ package com.android.settings.fuelgauge; import android.content.Context; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.widget.AppPreference; diff --git a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java index b73245733e3..a793aed64ad 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java +++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java @@ -21,11 +21,12 @@ import android.content.IntentFilter; import android.os.BatteryManager; import android.os.Bundle; import android.provider.SearchIndexableResource; -import androidx.annotation.VisibleForTesting; import android.view.Menu; import android.view.MenuInflater; 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; diff --git a/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java index cd34a477a62..8c7bfbc429a 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java +++ b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java @@ -21,9 +21,10 @@ import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; +import android.util.IconDrawableFactory; + import androidx.preference.Preference; import androidx.preference.PreferenceGroup; -import android.util.IconDrawableFactory; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/fuelgauge/PowerUsageBase.java b/src/com/android/settings/fuelgauge/PowerUsageBase.java index aa029191a86..52f786acdfb 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageBase.java +++ b/src/com/android/settings/fuelgauge/PowerUsageBase.java @@ -15,7 +15,7 @@ */ package com.android.settings.fuelgauge; -import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.*; +import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType; import android.app.Activity; import android.app.LoaderManager; @@ -23,9 +23,10 @@ import android.content.Context; import android.content.Loader; import android.os.Bundle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; import android.view.Menu; +import androidx.annotation.VisibleForTesting; + import com.android.internal.os.BatteryStatsHelper; import com.android.settings.dashboard.DashboardFragment; diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index c8daf726c84..315d62741dc 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -26,7 +26,6 @@ import android.content.Loader; import android.os.BatteryStats; import android.os.Bundle; import android.provider.SearchIndexableResource; -import androidx.annotation.VisibleForTesting; import android.text.BidiFormatter; import android.text.format.Formatter; import android.util.SparseArray; @@ -37,6 +36,8 @@ import android.view.View; import android.view.View.OnLongClickListener; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java index f282154b669..d3c1d54e1af 100644 --- a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java +++ b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java @@ -19,13 +19,12 @@ package com.android.settings.fuelgauge; import android.app.AppOpsManager; import android.content.Context; -import android.os.UserHandle; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.SettingsActivity; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.fuelgauge.batterytip.AppInfo; diff --git a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java index b89824bf083..4491155d716 100644 --- a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java +++ b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java @@ -21,10 +21,11 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.UserHandle; +import android.util.IconDrawableFactory; + import androidx.preference.CheckBoxPreference; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; -import android.util.IconDrawableFactory; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java index a3afd459ae8..af49f3d9541 100644 --- a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java +++ b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.fuelgauge; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settings.core.BasePreferenceController; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/fuelgauge/anomaly/Anomaly.java b/src/com/android/settings/fuelgauge/anomaly/Anomaly.java index edbc14f5fb6..801b28fd1a2 100644 --- a/src/com/android/settings/fuelgauge/anomaly/Anomaly.java +++ b/src/com/android/settings/fuelgauge/anomaly/Anomaly.java @@ -18,9 +18,10 @@ package com.android.settings.fuelgauge.anomaly; import android.os.Parcel; import android.os.Parcelable; -import androidx.annotation.IntDef; import android.text.TextUtils; +import androidx.annotation.IntDef; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Objects; diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java index 55d972157b2..166095d9492 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java @@ -19,11 +19,12 @@ package com.android.settings.fuelgauge.anomaly; import android.content.Context; import android.net.Uri; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.text.format.DateUtils; import android.util.KeyValueListParser; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java index 918f98af50e..440a81f5204 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java @@ -21,6 +21,7 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyLoader.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyLoader.java index fbd7dedf05a..97d67040766 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalyLoader.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyLoader.java @@ -21,15 +21,13 @@ import android.content.pm.PackageManager; import android.os.BatteryStats; import android.os.Bundle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.internal.os.BatteryStatsHelper; -import com.android.internal.util.ArrayUtils; import com.android.settingslib.utils.AsyncLoader; -import java.io.FileDescriptor; -import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyPreference.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyPreference.java index a54b02ec3d8..ba061473049 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalyPreference.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyPreference.java @@ -1,9 +1,8 @@ package com.android.settings.fuelgauge.anomaly; import android.content.Context; -import androidx.preference.Preference; -import com.android.settings.R; +import androidx.preference.Preference; /** * Preference that stores {@link Anomaly} diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.java b/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.java index dd90d89949b..a78576fc8db 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly; import android.content.Context; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java index 2926547237d..f9891b34449 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java @@ -18,10 +18,11 @@ package com.android.settings.fuelgauge.anomaly; import android.content.Context; import android.os.Build; -import androidx.annotation.VisibleForTesting; import android.util.Pair; import android.util.SparseIntArray; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.fuelgauge.anomaly.action.AnomalyAction; diff --git a/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java b/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java index e3666d8f14c..0519ea1d6ed 100644 --- a/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java +++ b/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java @@ -19,6 +19,7 @@ package com.android.settings.fuelgauge.anomaly.action; import android.app.AppOpsManager; import android.content.Context; import android.os.Build; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java b/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java index dcf7e46fda5..5a93c5151c6 100644 --- a/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java +++ b/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java @@ -19,6 +19,7 @@ package com.android.settings.fuelgauge.anomaly.action; import android.Manifest; import android.content.Context; import android.content.pm.permission.RuntimePermissionPresenter; + import androidx.annotation.VisibleForTesting; import androidx.core.content.PermissionChecker; diff --git a/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java b/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java index b5fd20b5caa..e9e31e3f2b6 100644 --- a/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java +++ b/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly.action; import android.content.Context; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetector.java b/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetector.java index 5cb188a220a..b65279bdc73 100644 --- a/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetector.java +++ b/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetector.java @@ -19,9 +19,8 @@ package com.android.settings.fuelgauge.anomaly.checker; import android.content.Context; import android.os.BatteryStats; import android.os.SystemClock; + import androidx.annotation.VisibleForTesting; -import android.text.format.DateUtils; -import android.util.ArrayMap; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; @@ -30,7 +29,6 @@ import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.fuelgauge.anomaly.Anomaly; import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy; import com.android.settings.fuelgauge.anomaly.AnomalyUtils; -import com.android.settings.fuelgauge.anomaly.action.AnomalyAction; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetector.java b/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetector.java index 73d092517a1..8b9e5d57776 100644 --- a/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetector.java +++ b/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetector.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.BatteryStats; import android.os.SystemClock; + import androidx.annotation.VisibleForTesting; import com.android.internal.os.BatterySipper; diff --git a/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java b/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java index f891b514868..3becba124a9 100644 --- a/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java +++ b/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java @@ -18,11 +18,10 @@ package com.android.settings.fuelgauge.anomaly.checker; import android.content.Context; import android.os.BatteryStats; -import androidx.annotation.VisibleForTesting; import android.text.format.DateUtils; import android.util.ArrayMap; -import android.util.ArraySet; -import android.util.Log; + +import androidx.annotation.VisibleForTesting; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; @@ -33,7 +32,6 @@ import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy; import com.android.settings.fuelgauge.anomaly.AnomalyUtils; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java index 06c05c075d5..c0ecbf9fb29 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterysaver; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java index b082eeb52f9..c824dbb450c 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java @@ -22,11 +22,12 @@ import android.net.Uri; import android.os.Handler; import android.os.Looper; import android.provider.Settings; +import android.util.Log; +import android.view.accessibility.AccessibilityNodeInfo; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Log; -import android.view.accessibility.AccessibilityNodeInfo; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java index 0618b44bdf1..80a72e67f71 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.fuelgauge.batterysaver; import android.content.Context; import android.os.PowerManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java index 331572ba611..bb73142b9be 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java @@ -22,9 +22,10 @@ import android.app.job.JobScheduler; import android.app.job.JobService; import android.content.ComponentName; import android.content.Context; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settingslib.utils.ThreadUtils; diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java index 44169f0bfe6..ad02c3a75b6 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java @@ -25,11 +25,12 @@ import android.content.ComponentName; import android.content.Context; import android.content.SharedPreferences; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Base64; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settingslib.utils.ThreadUtils; diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigReceiver.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigReceiver.java index 8e224470221..369e61382db 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigReceiver.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigReceiver.java @@ -16,15 +16,12 @@ package com.android.settings.fuelgauge.batterytip; -import android.app.PendingIntent; import android.app.StatsManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.util.Log; -import com.android.internal.annotations.VisibleForTesting; - /** * Receive broadcast when {@link StatsManager} restart, then check the anomaly config and * prepare info for {@link StatsManager} diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java index 404d8d7a889..e7f654c6ec5 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java @@ -19,9 +19,10 @@ package com.android.settings.fuelgauge.batterytip; import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import androidx.annotation.IntDef; import android.util.Log; +import androidx.annotation.IntDef; + import com.android.settings.fuelgauge.anomaly.Anomaly; import java.lang.annotation.Retention; diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java index ad63fd21ad6..9f28cc3ddda 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java @@ -34,11 +34,12 @@ import android.os.Bundle; import android.os.StatsDimensionsValue; import android.os.UserManager; import android.provider.Settings; -import androidx.annotation.GuardedBy; -import androidx.annotation.VisibleForTesting; import android.util.Log; import android.util.Pair; +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; diff --git a/src/com/android/settings/fuelgauge/batterytip/AppInfo.java b/src/com/android/settings/fuelgauge/batterytip/AppInfo.java index 4128f9dc487..7ec33062243 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AppInfo.java +++ b/src/com/android/settings/fuelgauge/batterytip/AppInfo.java @@ -18,10 +18,11 @@ package com.android.settings.fuelgauge.batterytip; import android.os.Parcel; import android.os.Parcelable; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.ArraySet; +import androidx.annotation.VisibleForTesting; + import com.android.settings.fuelgauge.anomaly.Anomaly; import java.util.Objects; diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java index 8edc45e338a..fe0fd180f56 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java @@ -20,6 +20,7 @@ import android.app.AppOpsManager; import android.content.Context; import android.os.UserManager; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java index 5cd52775ec0..00064869044 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java @@ -21,10 +21,11 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; +import android.view.LayoutInflater; + import androidx.annotation.VisibleForTesting; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import android.view.LayoutInflater; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; @@ -32,15 +33,12 @@ import com.android.settings.SettingsActivity; import com.android.settings.Utils; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import com.android.settings.fuelgauge.Estimate; import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController.BatteryTipListener; import com.android.settings.fuelgauge.batterytip.actions.BatteryTipAction; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip; import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip; -import com.android.settings.fuelgauge.batterytip.tips.SummaryTip; import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip; -import com.android.settingslib.utils.StringUtil; import java.util.List; diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java index c445687b20f..1742a05aac4 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip; import android.content.Context; + import androidx.annotation.VisibleForTesting; import com.android.internal.os.BatteryStatsHelper; @@ -26,8 +27,8 @@ import com.android.settings.fuelgauge.Estimate; import com.android.settings.fuelgauge.batterytip.detectors.EarlyWarningDetector; import com.android.settings.fuelgauge.batterytip.detectors.HighUsageDetector; import com.android.settings.fuelgauge.batterytip.detectors.LowBatteryDetector; -import com.android.settings.fuelgauge.batterytip.detectors.SmartBatteryDetector; import com.android.settings.fuelgauge.batterytip.detectors.RestrictAppDetector; +import com.android.settings.fuelgauge.batterytip.detectors.SmartBatteryDetector; import com.android.settings.fuelgauge.batterytip.detectors.SummaryDetector; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip; diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java index 42e723d2396..93234a7873b 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java @@ -18,12 +18,12 @@ package com.android.settings.fuelgauge.batterytip; import android.content.Context; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.util.KeyValueListParser; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import java.time.Duration; -import java.util.concurrent.TimeUnit; /** * Class to store the policy for battery tips, which comes from diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java index 21fc132259d..8e407f148d4 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java @@ -18,12 +18,12 @@ package com.android.settings.fuelgauge.batterytip; import android.content.Context; import android.os.Bundle; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.SettingsActivity; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.InstrumentedPreferenceFragment; @@ -34,7 +34,6 @@ import com.android.settings.fuelgauge.batterytip.tips.SummaryTip; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java index da2d81f1ff4..16a9de92221 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java @@ -23,6 +23,7 @@ import android.content.Context; import android.content.Intent; import android.os.UserHandle; import android.os.UserManager; + import androidx.annotation.NonNull; import com.android.internal.util.CollectionUtils; diff --git a/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java b/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java index b1866b9d222..d832640736a 100644 --- a/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java +++ b/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java @@ -19,7 +19,6 @@ package com.android.settings.fuelgauge.batterytip; import android.content.Context; import android.content.pm.PackageManager; import android.os.UserHandle; -import androidx.recyclerview.widget.RecyclerView; import android.util.IconDrawableFactory; import android.view.LayoutInflater; import android.view.View; @@ -27,10 +26,12 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.Utils; - import com.android.settingslib.utils.StringUtil; + import java.util.List; /** diff --git a/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java b/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java index 4a0b5ba01fb..230be3636fe 100644 --- a/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java +++ b/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java @@ -18,9 +18,6 @@ package com.android.settings.fuelgauge.batterytip; import androidx.annotation.IntDef; -import com.google.common.hash.HashFunction; -import com.google.common.hash.Hashing; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/OpenBatterySaverAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/OpenBatterySaverAction.java index 9f9a99d0f58..236413eb844 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/OpenBatterySaverAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/OpenBatterySaverAction.java @@ -19,17 +19,8 @@ package com.android.settings.fuelgauge.batterytip.actions; import android.content.Context; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.R; -import com.android.settings.SettingsActivity; -import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.core.SubSettingLauncher; -import com.android.settings.fuelgauge.BatteryUtils; -import com.android.settings.fuelgauge.RestrictedAppDetails; import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings; -import com.android.settings.fuelgauge.batterytip.AppInfo; -import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip; - -import java.util.List; /** * diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java index 59b5c15b055..ac946df571d 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java @@ -18,9 +18,10 @@ package com.android.settings.fuelgauge.batterytip.actions; import android.app.AppOpsManager; import android.content.Context; -import androidx.annotation.VisibleForTesting; import android.util.Pair; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.util.CollectionUtils; import com.android.settings.fuelgauge.BatteryUtils; diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java index ea40107d62e..419e0431345 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java @@ -18,9 +18,10 @@ package com.android.settings.fuelgauge.batterytip.actions; import android.app.AppOpsManager; import android.content.Context; -import androidx.annotation.VisibleForTesting; import android.util.Pair; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.fuelgauge.batterytip.AppInfo; diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java index 664a8ca202e..13ba5f6bcfe 100644 --- a/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java +++ b/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java @@ -18,15 +18,16 @@ package com.android.settings.fuelgauge.batterytip.detectors; import android.content.Context; import android.os.BatteryStats; -import androidx.annotation.VisibleForTesting; import android.text.format.DateUtils; +import androidx.annotation.VisibleForTesting; + import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; +import com.android.settings.fuelgauge.BatteryInfo; import com.android.settings.fuelgauge.BatteryUtils; -import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy; import com.android.settings.fuelgauge.batterytip.AppInfo; -import com.android.settings.fuelgauge.BatteryInfo; +import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy; import com.android.settings.fuelgauge.batterytip.HighUsageDataParser; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip; diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java index 3ff0989d08a..80e1af129d2 100644 --- a/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java +++ b/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java @@ -17,9 +17,10 @@ package com.android.settings.fuelgauge.batterytip.detectors; import android.content.Context; -import androidx.annotation.VisibleForTesting; import android.text.format.DateUtils; +import androidx.annotation.VisibleForTesting; + import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper; import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settings.fuelgauge.batterytip.BatteryDatabaseManager; diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/AppRestrictionPredicate.java b/src/com/android/settings/fuelgauge/batterytip/tips/AppRestrictionPredicate.java index 21bdbf10816..3650fe38e2c 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/AppRestrictionPredicate.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/AppRestrictionPredicate.java @@ -19,7 +19,6 @@ package com.android.settings.fuelgauge.batterytip.tips; import android.app.AppOpsManager; import android.content.Context; -import com.android.settings.Utils; import com.android.settings.fuelgauge.batterytip.AppInfo; import java.util.function.Predicate; diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java index b1a0d7c6b24..21af43249e9 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java @@ -19,11 +19,12 @@ package com.android.settings.fuelgauge.batterytip.tips; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; +import android.util.SparseIntArray; + import androidx.annotation.IdRes; import androidx.annotation.IntDef; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.util.SparseIntArray; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java index 2b8ad231c10..356097dfbda 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java @@ -19,12 +19,12 @@ package com.android.settings.fuelgauge.batterytip.tips; 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; import java.util.List; diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java index c2e45b19c48..818a46757df 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java @@ -20,7 +20,6 @@ import android.content.Context; import android.content.res.Resources; import android.icu.text.ListFormatter; import android.os.Parcel; -import android.text.TextUtils; import android.util.Pair; import com.android.internal.annotations.VisibleForTesting; diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java index 68c7d70be5e..e8dc6a9e789 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java @@ -18,7 +18,6 @@ package com.android.settings.fuelgauge.batterytip.tips; import android.content.Context; import android.os.Parcel; -import android.provider.Settings; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java index 8d0624aa965..0e2e8b59ffa 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java @@ -19,6 +19,7 @@ package com.android.settings.fuelgauge.batterytip.tips; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java b/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java index 187b1cabb4a..11c6b225395 100644 --- a/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java +++ b/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java @@ -18,7 +18,6 @@ package com.android.settings.gestures; import android.content.Context; -import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java b/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java index 6e318d65b2e..4a5ab1ab6e0 100644 --- a/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java +++ b/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java @@ -22,6 +22,7 @@ import static android.provider.Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENA import android.content.Context; import android.content.Intent; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java index 4433dd6e29e..95810a80bf4 100644 --- a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java @@ -22,9 +22,10 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.InlineSwitchPayload; diff --git a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java index f1c2ed30c2a..b9edbf48d81 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java @@ -16,24 +16,24 @@ package com.android.settings.gestures; +import static android.provider.Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP; + import android.annotation.UserIdInt; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.os.UserHandle; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; + import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.InlineSwitchPayload; import com.android.settings.search.ResultPayload; -import static android.provider.Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP; - public class DoubleTapScreenPreferenceController extends GesturePreferenceController { private final int ON = 1; diff --git a/src/com/android/settings/gestures/DoubleTapScreenSettings.java b/src/com/android/settings/gestures/DoubleTapScreenSettings.java index 29e0a1a4b73..8614b11f3e6 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenSettings.java +++ b/src/com/android/settings/gestures/DoubleTapScreenSettings.java @@ -18,7 +18,6 @@ package com.android.settings.gestures; import android.content.Context; import android.content.SharedPreferences; -import android.os.UserHandle; import android.provider.SearchIndexableResource; import com.android.internal.hardware.AmbientDisplayConfiguration; @@ -29,7 +28,6 @@ import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java index 6a72dc4e4d7..d4c63c0a76b 100644 --- a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java @@ -24,9 +24,10 @@ import android.hardware.SensorManager; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/gestures/GesturePreferenceController.java b/src/com/android/settings/gestures/GesturePreferenceController.java index 780325f0857..a4274bf7417 100644 --- a/src/com/android/settings/gestures/GesturePreferenceController.java +++ b/src/com/android/settings/gestures/GesturePreferenceController.java @@ -18,10 +18,10 @@ package com.android.settings.gestures; import android.content.Context; import android.os.Bundle; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java index 27172d95b1f..26ec87d8013 100644 --- a/src/com/android/settings/gestures/GestureSettings.java +++ b/src/com/android/settings/gestures/GestureSettings.java @@ -17,20 +17,14 @@ package com.android.settings.gestures; import android.content.Context; -import android.os.UserHandle; import android.provider.SearchIndexableResource; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; 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; -import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settingslib.core.lifecycle.Lifecycle; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java index 652e1518188..d0cdfb7039c 100644 --- a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java +++ b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.gestures; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + import androidx.annotation.NonNull; import com.android.internal.hardware.AmbientDisplayConfiguration; diff --git a/src/com/android/settings/gestures/PickupGesturePreferenceController.java b/src/com/android/settings/gestures/PickupGesturePreferenceController.java index 6d01e52e842..c76811c457a 100644 --- a/src/com/android/settings/gestures/PickupGesturePreferenceController.java +++ b/src/com/android/settings/gestures/PickupGesturePreferenceController.java @@ -24,9 +24,10 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.UserHandle; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; + import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; import com.android.settings.search.DatabaseIndexingUtils; diff --git a/src/com/android/settings/gestures/PreventRingingGestureSettings.java b/src/com/android/settings/gestures/PreventRingingGestureSettings.java index 09570dfb4f5..11eb84ce451 100644 --- a/src/com/android/settings/gestures/PreventRingingGestureSettings.java +++ b/src/com/android/settings/gestures/PreventRingingGestureSettings.java @@ -17,17 +17,13 @@ package com.android.settings.gestures; import android.content.Context; -import android.os.UserHandle; 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.settingslib.core.AbstractPreferenceController; -import com.android.settingslib.core.lifecycle.Lifecycle; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/com/android/settings/gestures/PreventRingingPreferenceController.java b/src/com/android/settings/gestures/PreventRingingPreferenceController.java index c6bc3aa8f26..29269234dc1 100644 --- a/src/com/android/settings/gestures/PreventRingingPreferenceController.java +++ b/src/com/android/settings/gestures/PreventRingingPreferenceController.java @@ -24,6 +24,7 @@ import static android.provider.Settings.Secure.VOLUME_HUSH_VIBRATE; import android.content.Context; import android.os.Bundle; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/gestures/SwipeUpPreferenceController.java b/src/com/android/settings/gestures/SwipeUpPreferenceController.java index 331a5efbaf1..f48d21b90d4 100644 --- a/src/com/android/settings/gestures/SwipeUpPreferenceController.java +++ b/src/com/android/settings/gestures/SwipeUpPreferenceController.java @@ -22,7 +22,6 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.os.UserManager; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import com.android.internal.R; diff --git a/src/com/android/settings/graph/BottomLabelLayout.java b/src/com/android/settings/graph/BottomLabelLayout.java index 20d97e5e4d0..d68fa2fc943 100644 --- a/src/com/android/settings/graph/BottomLabelLayout.java +++ b/src/com/android/settings/graph/BottomLabelLayout.java @@ -19,12 +19,13 @@ package com.android.settings.graph; import android.annotation.Nullable; import android.content.Context; -import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.view.Gravity; import android.view.View; import android.widget.LinearLayout; +import androidx.annotation.VisibleForTesting; + import com.android.settingslib.R; /** diff --git a/src/com/android/settings/graph/UsageGraph.java b/src/com/android/settings/graph/UsageGraph.java index b9d517d5e8d..51e0270f7e2 100644 --- a/src/com/android/settings/graph/UsageGraph.java +++ b/src/com/android/settings/graph/UsageGraph.java @@ -28,12 +28,13 @@ import android.graphics.Paint.Style; import android.graphics.Path; import android.graphics.Shader.TileMode; import android.graphics.drawable.Drawable; -import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.util.SparseIntArray; import android.util.TypedValue; import android.view.View; +import androidx.annotation.VisibleForTesting; + import com.android.settings.fuelgauge.BatteryUtils; import com.android.settingslib.R; diff --git a/src/com/android/settings/graph/UsageView.java b/src/com/android/settings/graph/UsageView.java index bcf04414cfe..8297d0b0bed 100644 --- a/src/com/android/settings/graph/UsageView.java +++ b/src/com/android/settings/graph/UsageView.java @@ -24,6 +24,7 @@ import android.view.View; import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.TextView; + import com.android.settingslib.R; public class UsageView extends FrameLayout { diff --git a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java index a635842aa4c..80f668069f1 100644 --- a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java +++ b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java @@ -19,9 +19,10 @@ package com.android.settings.inputmethod; import android.content.Context; import android.hardware.input.InputManager; import android.provider.Settings; +import android.view.InputDevice; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.view.InputDevice; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java index 37f64133915..be54ee23329 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java +++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java @@ -18,9 +18,10 @@ package com.android.settings.inputmethod; import android.content.Intent; import android.os.Bundle; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.inputmethod.InputMethodAndSubtypeEnablerManager; diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java index e100dd2dc96..62c0470eddb 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java @@ -19,7 +19,6 @@ package com.android.settings.inputmethod; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; -import android.app.DialogFragment; import android.app.LoaderManager.LoaderCallbacks; import android.content.AsyncTaskLoader; import android.content.Context; diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java index 47625e768bf..a455b3c7d29 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java @@ -22,10 +22,11 @@ import android.hardware.input.InputManager; import android.hardware.input.InputManager.InputDeviceListener; import android.hardware.input.KeyboardLayout; import android.os.Bundle; +import android.view.InputDevice; + import androidx.preference.CheckBoxPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.view.InputDevice; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java index cc2e8aa82fe..532ad15065a 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java @@ -30,13 +30,14 @@ import android.os.Handler; import android.os.UserHandle; import android.provider.SearchIndexableResource; import android.provider.Settings.Secure; -import androidx.preference.SwitchPreference; +import android.text.TextUtils; +import android.view.InputDevice; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; -import android.view.InputDevice; +import androidx.preference.SwitchPreference; import com.android.internal.inputmethod.InputMethodUtils; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java index 38937de3b8e..78f4d347b70 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.inputmethod; import android.content.Context; import android.hardware.input.InputManager; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/inputmethod/SpellCheckerPreference.java b/src/com/android/settings/inputmethod/SpellCheckerPreference.java index 62874266bf3..88649ec249c 100644 --- a/src/com/android/settings/inputmethod/SpellCheckerPreference.java +++ b/src/com/android/settings/inputmethod/SpellCheckerPreference.java @@ -21,12 +21,13 @@ import android.content.ActivityNotFoundException; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.view.View; import android.view.View.OnClickListener; import android.view.textservice.SpellCheckerInfo; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.CustomListPreference; import com.android.settings.R; diff --git a/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java b/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java index 8adf2389770..a7ebd07598f 100644 --- a/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java +++ b/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java @@ -17,11 +17,12 @@ package com.android.settings.inputmethod; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.view.textservice.SpellCheckerInfo; import android.view.textservice.TextServicesManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java index 3f38704de6e..20ec6f81908 100644 --- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java +++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java @@ -22,16 +22,17 @@ import android.content.DialogInterface; import android.content.pm.ApplicationInfo; import android.os.Bundle; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceScreen; import android.util.Log; import android.view.textservice.SpellCheckerInfo; import android.view.textservice.SpellCheckerSubtype; import android.view.textservice.TextServicesManager; import android.widget.Switch; +import androidx.preference.Preference; +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; diff --git a/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java b/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java index 3f1122a58ce..9ec10785eb7 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java +++ b/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java @@ -21,9 +21,10 @@ import android.content.CursorLoader; import android.database.Cursor; import android.database.MatrixCursor; import android.provider.UserDictionary; -import androidx.annotation.VisibleForTesting; import android.util.ArraySet; +import androidx.annotation.VisibleForTesting; + import java.util.Locale; import java.util.Objects; import java.util.Set; diff --git a/src/com/android/settings/inputmethod/UserDictionaryList.java b/src/com/android/settings/inputmethod/UserDictionaryList.java index 990c12bcdb7..916e55419f1 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryList.java +++ b/src/com/android/settings/inputmethod/UserDictionaryList.java @@ -22,14 +22,15 @@ import android.content.Intent; import android.database.Cursor; import android.os.Bundle; import android.provider.UserDictionary; -import androidx.annotation.NonNull; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; import android.text.TextUtils; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodSubtype; +import androidx.annotation.NonNull; +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; diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java index bd33b3ff4c9..585ce194b22 100644 --- a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java @@ -24,10 +24,11 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.provider.SearchIndexableResource; -import androidx.preference.Preference; import android.view.inputmethod.InputMethodInfo; 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; diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java index 4a046469d9d..0f5a49ea2bc 100644 --- a/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java +++ b/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java @@ -19,11 +19,12 @@ package com.android.settings.inputmethod; import android.app.admin.DevicePolicyManager; import android.content.Context; import android.content.pm.PackageManager; -import androidx.preference.Preference; import android.text.BidiFormatter; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java index 7e7bdcaecd9..7e04023a79f 100644 --- a/src/com/android/settings/language/LanguageAndInputSettings.java +++ b/src/com/android/settings/language/LanguageAndInputSettings.java @@ -24,12 +24,13 @@ import android.content.pm.PackageManager; import android.provider.SearchIndexableResource; import android.provider.Settings; import android.speech.tts.TtsEngines; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.inputmethod.InputMethodInfo; 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.applications.defaultapps.DefaultAutofillPreferenceController; diff --git a/src/com/android/settings/language/PhoneLanguagePreferenceController.java b/src/com/android/settings/language/PhoneLanguagePreferenceController.java index af60ba0fa44..c0aedfeaede 100644 --- a/src/com/android/settings/language/PhoneLanguagePreferenceController.java +++ b/src/com/android/settings/language/PhoneLanguagePreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.language; import android.content.Context; + import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/language/PointerSpeedController.java b/src/com/android/settings/language/PointerSpeedController.java index 8a0226a20d1..67326ddab0e 100644 --- a/src/com/android/settings/language/PointerSpeedController.java +++ b/src/com/android/settings/language/PointerSpeedController.java @@ -18,11 +18,11 @@ package com.android.settings.language; import android.content.Context; -import com.android.settings.core.BasePreferenceController; -import com.android.settings.R; - import androidx.annotation.VisibleForTesting; +import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; + public class PointerSpeedController extends BasePreferenceController { diff --git a/src/com/android/settings/language/TtsPreferenceController.java b/src/com/android/settings/language/TtsPreferenceController.java index f19047b5b88..c83492c4883 100644 --- a/src/com/android/settings/language/TtsPreferenceController.java +++ b/src/com/android/settings/language/TtsPreferenceController.java @@ -19,8 +19,8 @@ package com.android.settings.language; import android.content.Context; import android.speech.tts.TtsEngines; -import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.R; +import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; public class TtsPreferenceController extends AbstractPreferenceController diff --git a/src/com/android/settings/language/UserDictionaryPreferenceController.java b/src/com/android/settings/language/UserDictionaryPreferenceController.java index 9338a296da9..f2c55c43da3 100644 --- a/src/com/android/settings/language/UserDictionaryPreferenceController.java +++ b/src/com/android/settings/language/UserDictionaryPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.language; import android.app.Fragment; import android.content.Context; import android.os.Bundle; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java index be6447ef195..af7dc7613dc 100644 --- a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java +++ b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java @@ -20,9 +20,6 @@ import android.content.Context; import android.graphics.Canvas; import android.os.Bundle; import android.os.LocaleList; -import androidx.core.view.MotionEventCompat; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.ItemTouchHelper; import android.util.Log; import android.util.TypedValue; import android.view.LayoutInflater; @@ -31,11 +28,14 @@ import android.view.View; import android.view.ViewGroup; import android.widget.CompoundButton; +import androidx.core.view.MotionEventCompat; +import androidx.recyclerview.widget.ItemTouchHelper; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.app.LocalePicker; import com.android.internal.app.LocaleStore; - -import com.android.settings.shortcut.CreateShortcut; import com.android.settings.R; +import com.android.settings.shortcut.CreateShortcut; import java.text.NumberFormat; import java.util.ArrayList; diff --git a/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java b/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java index d3d58ff73e5..90698129ccc 100644 --- a/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java +++ b/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java @@ -18,10 +18,11 @@ package com.android.settings.localepicker; import android.content.Context; import android.os.Bundle; +import android.view.View; + import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import android.view.View; import com.android.settings.R; diff --git a/src/com/android/settings/localepicker/LocaleListEditor.java b/src/com/android/settings/localepicker/LocaleListEditor.java index de68f00e318..ffb8cae467d 100644 --- a/src/com/android/settings/localepicker/LocaleListEditor.java +++ b/src/com/android/settings/localepicker/LocaleListEditor.java @@ -16,20 +16,23 @@ package com.android.settings.localepicker; +import static android.os.UserManager.DISALLOW_CONFIG_LOCALE; + import android.app.AlertDialog; import android.app.FragmentTransaction; import android.content.DialogInterface; import android.os.Bundle; import android.os.LocaleList; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; - import android.widget.TextView; + +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.app.LocalePicker; import com.android.internal.app.LocalePickerWithRegion; import com.android.internal.app.LocaleStore; @@ -41,8 +44,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import static android.os.UserManager.DISALLOW_CONFIG_LOCALE; - /** * Drag-and-drop editor for the user-ordered locale lists. */ diff --git a/src/com/android/settings/localepicker/LocaleRecyclerView.java b/src/com/android/settings/localepicker/LocaleRecyclerView.java index 93d54a49a8f..e82874dab70 100644 --- a/src/com/android/settings/localepicker/LocaleRecyclerView.java +++ b/src/com/android/settings/localepicker/LocaleRecyclerView.java @@ -17,10 +17,11 @@ package com.android.settings.localepicker; import android.content.Context; -import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.view.MotionEvent; +import androidx.recyclerview.widget.RecyclerView; + class LocaleRecyclerView extends RecyclerView { public LocaleRecyclerView(Context context) { super(context); diff --git a/src/com/android/settings/location/BluetoothScanningPreferenceController.java b/src/com/android/settings/location/BluetoothScanningPreferenceController.java index 6350ffa49f1..d16e1e58e2f 100644 --- a/src/com/android/settings/location/BluetoothScanningPreferenceController.java +++ b/src/com/android/settings/location/BluetoothScanningPreferenceController.java @@ -15,8 +15,9 @@ package com.android.settings.location; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/location/LocationEnabler.java b/src/com/android/settings/location/LocationEnabler.java index d45128cea3d..65de6e2339d 100644 --- a/src/com/android/settings/location/LocationEnabler.java +++ b/src/com/android/settings/location/LocationEnabler.java @@ -13,8 +13,11 @@ */ package com.android.settings.location; +import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced; +import static com.android.settingslib.Utils.updateLocationEnabled; +import static com.android.settingslib.Utils.updateLocationMode; + import android.app.ActivityManager; -import android.Manifest.permission; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -23,9 +26,10 @@ import android.location.LocationManager; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.Utils; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -33,10 +37,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import static com.android.settingslib.Utils.updateLocationMode; -import static com.android.settingslib.Utils.updateLocationEnabled; -import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced; - /** * A class that listens to location settings change and modifies location settings diff --git a/src/com/android/settings/location/LocationFooterPreferenceController.java b/src/com/android/settings/location/LocationFooterPreferenceController.java index 658c3cd4520..3431aa25c05 100644 --- a/src/com/android/settings/location/LocationFooterPreferenceController.java +++ b/src/com/android/settings/location/LocationFooterPreferenceController.java @@ -22,14 +22,17 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; import android.location.LocationManager; +import android.util.Log; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; -import android.util.Log; + 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.widget.FooterPreference; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/src/com/android/settings/location/LocationForWorkPreferenceController.java b/src/com/android/settings/location/LocationForWorkPreferenceController.java index 3f51d6f4db5..580f8880f93 100644 --- a/src/com/android/settings/location/LocationForWorkPreferenceController.java +++ b/src/com/android/settings/location/LocationForWorkPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.location; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/location/LocationPreferenceController.java b/src/com/android/settings/location/LocationPreferenceController.java index a091ca82b01..bc39b19e1a7 100644 --- a/src/com/android/settings/location/LocationPreferenceController.java +++ b/src/com/android/settings/location/LocationPreferenceController.java @@ -21,15 +21,17 @@ import android.content.Intent; import android.content.IntentFilter; import android.location.LocationManager; import android.provider.Settings.Secure; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.InlineListPayload; import com.android.settings.search.ResultPayload; +import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; diff --git a/src/com/android/settings/location/LocationScanningPreferenceController.java b/src/com/android/settings/location/LocationScanningPreferenceController.java index 33fe612913a..9d1bdc0dc86 100644 --- a/src/com/android/settings/location/LocationScanningPreferenceController.java +++ b/src/com/android/settings/location/LocationScanningPreferenceController.java @@ -18,11 +18,11 @@ package com.android.settings.location; import android.content.Context; -import com.android.settings.core.BasePreferenceController; -import com.android.settings.R; - import androidx.annotation.VisibleForTesting; +import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; + public class LocationScanningPreferenceController extends BasePreferenceController { diff --git a/src/com/android/settings/location/LocationServicePreferenceController.java b/src/com/android/settings/location/LocationServicePreferenceController.java index f865b449041..cc5e53d0822 100644 --- a/src/com/android/settings/location/LocationServicePreferenceController.java +++ b/src/com/android/settings/location/LocationServicePreferenceController.java @@ -19,11 +19,12 @@ import android.content.Intent; import android.content.IntentFilter; import android.location.SettingInjectorService; import android.os.UserHandle; +import android.util.Log; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import android.util.Log; import com.android.settings.widget.RestrictedAppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java index 8b0ee8a496b..2d3911bbe91 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -21,8 +21,10 @@ import android.content.Context; import android.location.SettingInjectorService; import android.os.Bundle; 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; @@ -34,6 +36,7 @@ import com.android.settings.widget.SwitchBar; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/src/com/android/settings/location/LocationSliceBuilder.java b/src/com/android/settings/location/LocationSliceBuilder.java index 160d90a6390..c2f2adfb38a 100644 --- a/src/com/android/settings/location/LocationSliceBuilder.java +++ b/src/com/android/settings/location/LocationSliceBuilder.java @@ -29,18 +29,17 @@ import android.content.Intent; import android.net.Uri; import android.provider.SettingsSlicesContract; +import androidx.core.graphics.drawable.IconCompat; +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; import com.android.settings.search.DatabaseIndexingUtils; -import androidx.slice.Slice; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.SliceAction; - -import androidx.core.graphics.drawable.IconCompat; - /** * Utility class to build an intent-based Location Slice. */ diff --git a/src/com/android/settings/location/LocationSwitchBarController.java b/src/com/android/settings/location/LocationSwitchBarController.java index 70ecc1eb850..7aa66ce2049 100644 --- a/src/com/android/settings/location/LocationSwitchBarController.java +++ b/src/com/android/settings/location/LocationSwitchBarController.java @@ -16,6 +16,7 @@ package com.android.settings.location; import android.content.Context; import android.os.UserHandle; import android.widget.Switch; + import com.android.settings.widget.SwitchBar; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java index f4ae15bdc54..a41aa945d20 100644 --- a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java +++ b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java @@ -16,10 +16,12 @@ package com.android.settings.location; import android.content.Context; import android.os.Bundle; import android.os.UserHandle; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; import com.android.settings.core.SubSettingLauncher; @@ -27,6 +29,7 @@ import com.android.settings.dashboard.DashboardFragment; import com.android.settings.widget.AppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; + import java.util.List; public class RecentLocationRequestPreferenceController extends LocationBasePreferenceController { diff --git a/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java b/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java index 0b7614c22be..1a11d92933d 100644 --- a/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java +++ b/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java @@ -19,6 +19,7 @@ package com.android.settings.location; 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; @@ -26,6 +27,7 @@ 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 java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java b/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java index 99dc9fc3487..6a1ebd938f1 100644 --- a/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java +++ b/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java @@ -17,13 +17,16 @@ package com.android.settings.location; import android.content.Context; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; + import com.android.settings.widget.AppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; + import java.util.List; /** Preference controller for preference category displaying all recent location requests. */ diff --git a/src/com/android/settings/location/SettingsInjector.java b/src/com/android/settings/location/SettingsInjector.java index 52b06564f75..1144e8f0ab7 100644 --- a/src/com/android/settings/location/SettingsInjector.java +++ b/src/com/android/settings/location/SettingsInjector.java @@ -37,13 +37,14 @@ import android.os.Messenger; import android.os.SystemClock; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.AttributeSet; import android.util.IconDrawableFactory; import android.util.Log; import android.util.Xml; +import androidx.preference.Preference; + import com.android.settings.widget.AppPreference; import com.android.settings.widget.RestrictedAppPreference; diff --git a/src/com/android/settings/location/WifiScanningPreferenceController.java b/src/com/android/settings/location/WifiScanningPreferenceController.java index c5389ca496c..234ec5e53e1 100644 --- a/src/com/android/settings/location/WifiScanningPreferenceController.java +++ b/src/com/android/settings/location/WifiScanningPreferenceController.java @@ -15,8 +15,9 @@ package com.android.settings.location; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java index 469449ff107..b0776f0e59e 100644 --- a/src/com/android/settings/network/AirplaneModePreferenceController.java +++ b/src/com/android/settings/network/AirplaneModePreferenceController.java @@ -22,11 +22,11 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.os.SystemProperties; -import android.provider.SettingsSlicesContract; -import androidx.preference.SwitchPreference; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; +import androidx.preference.SwitchPreference; import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.TelephonyProperties; diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java index 1d6e81ee708..9bc435a57ea 100644 --- a/src/com/android/settings/network/ApnEditor.java +++ b/src/com/android/settings/network/ApnEditor.java @@ -28,13 +28,6 @@ import android.net.Uri; import android.os.Bundle; import android.os.PersistableBundle; import android.provider.Telephony; -import androidx.annotation.VisibleForTesting; -import androidx.preference.MultiSelectListPreference; -import androidx.preference.SwitchPreference; -import androidx.preference.EditTextPreference; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; import android.telephony.CarrierConfigManager; import android.telephony.ServiceState; import android.telephony.SubscriptionManager; @@ -48,6 +41,14 @@ import android.view.MenuItem; import android.view.View; import android.view.View.OnKeyListener; +import androidx.annotation.VisibleForTesting; +import androidx.preference.EditTextPreference; +import androidx.preference.ListPreference; +import androidx.preference.MultiSelectListPreference; +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; diff --git a/src/com/android/settings/network/ApnPreference.java b/src/com/android/settings/network/ApnPreference.java index ee53ca9518f..412259bab72 100755 --- a/src/com/android/settings/network/ApnPreference.java +++ b/src/com/android/settings/network/ApnPreference.java @@ -21,8 +21,6 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.provider.Telephony; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.telephony.SubscriptionManager; import android.util.AttributeSet; import android.util.Log; @@ -32,6 +30,9 @@ import android.widget.CompoundButton; import android.widget.RadioButton; import android.widget.RelativeLayout; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; public class ApnPreference extends Preference implements diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java index b47cb424a18..df0b1b4dfea 100755 --- a/src/com/android/settings/network/ApnSettings.java +++ b/src/com/android/settings/network/ApnSettings.java @@ -37,8 +37,6 @@ import android.os.PersistableBundle; import android.os.UserHandle; import android.os.UserManager; import android.provider.Telephony; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; @@ -52,6 +50,9 @@ import android.view.MenuItem; import android.view.MotionEvent; 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; diff --git a/src/com/android/settings/network/MobileNetworkPreferenceController.java b/src/com/android/settings/network/MobileNetworkPreferenceController.java index e4d52bc8d09..5e729afec3c 100644 --- a/src/com/android/settings/network/MobileNetworkPreferenceController.java +++ b/src/com/android/settings/network/MobileNetworkPreferenceController.java @@ -24,13 +24,14 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.UserManager; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.PhoneStateListener; import android.telephony.ServiceState; import android.telephony.TelephonyManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreference; diff --git a/src/com/android/settings/network/MobilePlanPreferenceController.java b/src/com/android/settings/network/MobilePlanPreferenceController.java index f29f11c3320..1db6b2e0b32 100644 --- a/src/com/android/settings/network/MobilePlanPreferenceController.java +++ b/src/com/android/settings/network/MobilePlanPreferenceController.java @@ -31,11 +31,12 @@ import android.net.NetworkInfo; import android.net.Uri; import android.os.Bundle; import android.os.UserManager; -import androidx.preference.Preference; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.Utils; diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java index 5dafeec2e16..581799930ed 100644 --- a/src/com/android/settings/network/NetworkDashboardFragment.java +++ b/src/com/android/settings/network/NetworkDashboardFragment.java @@ -24,10 +24,11 @@ import android.app.Dialog; import android.app.Fragment; import android.content.Context; import android.provider.SearchIndexableResource; -import androidx.annotation.VisibleForTesting; import android.text.BidiFormatter; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; diff --git a/src/com/android/settings/network/NetworkResetRestrictionChecker.java b/src/com/android/settings/network/NetworkResetRestrictionChecker.java index 5ae3a77423e..bb1fde7bf59 100644 --- a/src/com/android/settings/network/NetworkResetRestrictionChecker.java +++ b/src/com/android/settings/network/NetworkResetRestrictionChecker.java @@ -19,6 +19,7 @@ package com.android.settings.network; import android.content.Context; import android.os.UserHandle; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/network/NetworkScorerPicker.java b/src/com/android/settings/network/NetworkScorerPicker.java index 0a63adca80c..d9c20ffdf48 100644 --- a/src/com/android/settings/network/NetworkScorerPicker.java +++ b/src/com/android/settings/network/NetworkScorerPicker.java @@ -19,14 +19,15 @@ import android.content.Context; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +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; diff --git a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java index 98482016e4c..7239b00d084 100644 --- a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java +++ b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.network; import android.content.Context; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java index 0627cb30544..8ba2d62c3fc 100644 --- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java +++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java @@ -29,7 +29,6 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.system.Os; import android.text.Editable; import android.text.TextWatcher; @@ -42,6 +41,8 @@ import android.widget.EditText; import android.widget.RadioGroup; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; @@ -49,7 +50,6 @@ import com.android.settings.utils.AnnotationSpan; import com.android.settingslib.CustomDialogPreference; import com.android.settingslib.HelpUtils; -import java.net.InetAddress; import java.util.HashMap; import java.util.Map; diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java index 13e5bf342dc..62714fa6380 100644 --- a/src/com/android/settings/network/PrivateDnsPreferenceController.java +++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java @@ -23,8 +23,8 @@ import static android.provider.Settings.Global.PRIVATE_DNS_DEFAULT_MODE; import static android.provider.Settings.Global.PRIVATE_DNS_MODE; import static android.provider.Settings.Global.PRIVATE_DNS_SPECIFIER; -import android.content.Context; import android.content.ContentResolver; +import android.content.Context; import android.content.res.Resources; import android.database.ContentObserver; import android.net.ConnectivityManager; @@ -35,6 +35,7 @@ import android.net.Uri; import android.os.Handler; import android.os.Looper; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; @@ -42,9 +43,9 @@ 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.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import com.android.settingslib.core.lifecycle.LifecycleObserver; import java.net.InetAddress; import java.util.List; diff --git a/src/com/android/settings/network/ProxyPreferenceController.java b/src/com/android/settings/network/ProxyPreferenceController.java index dc2eb9f5bdb..8f26bfb6b10 100644 --- a/src/com/android/settings/network/ProxyPreferenceController.java +++ b/src/com/android/settings/network/ProxyPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.network; import android.app.admin.DevicePolicyManager; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java index 4bafa2511d0..a47b897b191 100644 --- a/src/com/android/settings/network/TetherPreferenceController.java +++ b/src/com/android/settings/network/TetherPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.network; import static android.os.UserManager.DISALLOW_CONFIG_TETHERING; + import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced; import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction; @@ -33,6 +34,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/network/VpnPreferenceController.java b/src/com/android/settings/network/VpnPreferenceController.java index bb0bff638ea..8ecd79660f9 100644 --- a/src/com/android/settings/network/VpnPreferenceController.java +++ b/src/com/android/settings/network/VpnPreferenceController.java @@ -29,11 +29,12 @@ import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; import android.provider.SettingsSlicesContract; +import android.util.Log; +import android.util.SparseArray; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Log; -import android.util.SparseArray; import com.android.internal.net.LegacyVpnInfo; import com.android.internal.net.VpnConfig; diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java index 4e90680aac9..ebed87b9a2b 100644 --- a/src/com/android/settings/nfc/AndroidBeam.java +++ b/src/com/android/settings/nfc/AndroidBeam.java @@ -16,6 +16,8 @@ package com.android.settings.nfc; +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + import android.nfc.NfcAdapter; import android.os.Bundle; import android.os.UserHandle; @@ -28,16 +30,14 @@ import android.view.ViewGroup; import android.widget.Switch; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; -import com.android.settingslib.HelpUtils; -import com.android.settings.core.InstrumentedFragment; import com.android.settings.R; import com.android.settings.SettingsActivity; +import com.android.settings.core.InstrumentedFragment; +import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settings.widget.SwitchBar; +import com.android.settingslib.HelpUtils; import com.android.settingslib.RestrictedLockUtils; -import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - public class AndroidBeam extends InstrumentedFragment implements SwitchBar.OnSwitchChangeListener { private View mView; diff --git a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java index 12ab1b756dc..07931523ff8 100644 --- a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java +++ b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.nfc; import android.content.Context; import android.nfc.NfcAdapter; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; @@ -26,8 +27,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import java.util.List; - public class AndroidBeamPreferenceController extends BasePreferenceController implements LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/nfc/BaseNfcEnabler.java b/src/com/android/settings/nfc/BaseNfcEnabler.java index 88bafb98fb9..c046d05aced 100644 --- a/src/com/android/settings/nfc/BaseNfcEnabler.java +++ b/src/com/android/settings/nfc/BaseNfcEnabler.java @@ -21,7 +21,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.nfc.NfcAdapter; -import androidx.preference.Preference; /** * BaseNfcEnabler is a abstract helper to manage the Nfc state for Nfc and Android Beam diff --git a/src/com/android/settings/nfc/NfcAirplaneModeObserver.java b/src/com/android/settings/nfc/NfcAirplaneModeObserver.java index d0ce045296f..b3e6f256157 100644 --- a/src/com/android/settings/nfc/NfcAirplaneModeObserver.java +++ b/src/com/android/settings/nfc/NfcAirplaneModeObserver.java @@ -22,6 +22,7 @@ import android.nfc.NfcAdapter; import android.os.Handler; import android.os.Looper; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java index b3450cbb8cd..77c40e2de1a 100644 --- a/src/com/android/settings/nfc/NfcEnabler.java +++ b/src/com/android/settings/nfc/NfcEnabler.java @@ -18,6 +18,7 @@ package com.android.settings.nfc; import android.content.Context; import android.nfc.NfcAdapter; + import androidx.preference.SwitchPreference; /** diff --git a/src/com/android/settings/nfc/NfcForegroundPreference.java b/src/com/android/settings/nfc/NfcForegroundPreference.java index 728f2e4b598..8dd54827912 100644 --- a/src/com/android/settings/nfc/NfcForegroundPreference.java +++ b/src/com/android/settings/nfc/NfcForegroundPreference.java @@ -16,6 +16,7 @@ package com.android.settings.nfc; import android.content.Context; + import androidx.preference.DropDownPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/nfc/NfcPaymentPreference.java b/src/com/android/settings/nfc/NfcPaymentPreference.java index 0838a90e622..9dd11135436 100644 --- a/src/com/android/settings/nfc/NfcPaymentPreference.java +++ b/src/com/android/settings/nfc/NfcPaymentPreference.java @@ -16,12 +16,11 @@ package com.android.settings.nfc; import android.app.AlertDialog; +import android.app.Dialog; import android.content.ActivityNotFoundException; import android.content.Context; -import android.app.Dialog; import android.content.DialogInterface; import android.content.Intent; -import androidx.preference.PreferenceViewHolder; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -31,6 +30,8 @@ import android.widget.CompoundButton; import android.widget.ImageView; import android.widget.RadioButton; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.nfc.PaymentBackend.PaymentAppInfo; import com.android.settingslib.CustomDialogPreference; diff --git a/src/com/android/settings/nfc/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java index a74b9875605..2ea3a3c5735 100644 --- a/src/com/android/settings/nfc/NfcPreferenceController.java +++ b/src/com/android/settings/nfc/NfcPreferenceController.java @@ -30,8 +30,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import java.util.List; - public class NfcPreferenceController extends TogglePreferenceController implements LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java index 27ae0934845..cd2df68ea0b 100644 --- a/src/com/android/settings/nfc/PaymentSettings.java +++ b/src/com/android/settings/nfc/PaymentSettings.java @@ -21,14 +21,14 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.res.Resources; import android.os.Bundle; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java index 4284ecfc796..9f4ed8f02f6 100644 --- a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java +++ b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java @@ -27,6 +27,7 @@ import android.content.pm.ServiceInfo; import android.provider.Settings; import android.service.notification.ConditionProviderService; import android.service.notification.ZenModeConfig; + import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/notification/AbstractZenModePreferenceController.java b/src/com/android/settings/notification/AbstractZenModePreferenceController.java index 175a607b520..41841ddff7b 100644 --- a/src/com/android/settings/notification/AbstractZenModePreferenceController.java +++ b/src/com/android/settings/notification/AbstractZenModePreferenceController.java @@ -29,6 +29,7 @@ import android.os.UserHandle; import android.provider.Settings; import android.service.notification.ScheduleCalendar; import android.service.notification.ZenModeConfig; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java b/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java index 2dcc31df8a4..6c0d59b479b 100644 --- a/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java +++ b/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java @@ -21,6 +21,7 @@ import android.content.IntentFilter; import android.media.AudioManager; import android.os.UserHandle; import android.os.UserManager; + import androidx.preference.Preference; import com.android.internal.annotations.VisibleForTesting; @@ -28,7 +29,6 @@ import com.android.settings.accounts.AccountRestrictionHelper; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.SliderPreferenceController; import com.android.settingslib.RestrictedPreference; -import com.android.settingslib.core.AbstractPreferenceController; /** * Base class for preference controller that handles preference that enforce adjust volume diff --git a/src/com/android/settings/notification/AllowSoundPreferenceController.java b/src/com/android/settings/notification/AllowSoundPreferenceController.java index a1fd3c0c8fd..cbabd2d6e1d 100644 --- a/src/com/android/settings/notification/AllowSoundPreferenceController.java +++ b/src/com/android/settings/notification/AllowSoundPreferenceController.java @@ -22,9 +22,10 @@ import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; import android.app.NotificationChannel; import android.content.Context; -import androidx.preference.Preference; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedSwitchPreference; diff --git a/src/com/android/settings/notification/AppLinkPreferenceController.java b/src/com/android/settings/notification/AppLinkPreferenceController.java index 6e09ccebfe7..c696e8ef8a4 100644 --- a/src/com/android/settings/notification/AppLinkPreferenceController.java +++ b/src/com/android/settings/notification/AppLinkPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java index 9ebcd33b7bf..a5f7ff10eaa 100644 --- a/src/com/android/settings/notification/AppNotificationSettings.java +++ b/src/com/android/settings/notification/AppNotificationSettings.java @@ -21,13 +21,14 @@ import android.app.NotificationChannelGroup; import android.content.Context; import android.os.AsyncTask; import android.os.Bundle; -import androidx.preference.SwitchPreference; +import android.text.TextUtils; +import android.util.Log; + import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; -import android.util.Log; +import androidx.preference.SwitchPreference; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; diff --git a/src/com/android/settings/notification/AudioHelper.java b/src/com/android/settings/notification/AudioHelper.java index 5f745c8a691..a918d8689d6 100644 --- a/src/com/android/settings/notification/AudioHelper.java +++ b/src/com/android/settings/notification/AudioHelper.java @@ -22,6 +22,7 @@ import android.media.AudioManager; import android.media.AudioSystem; import android.os.UserHandle; import android.os.UserManager; + import com.android.settings.Utils; /** diff --git a/src/com/android/settings/notification/BadgePreferenceController.java b/src/com/android/settings/notification/BadgePreferenceController.java index e6cd4494d23..ad417b0ad6a 100644 --- a/src/com/android/settings/notification/BadgePreferenceController.java +++ b/src/com/android/settings/notification/BadgePreferenceController.java @@ -18,9 +18,9 @@ package com.android.settings.notification; import static android.provider.Settings.Secure.NOTIFICATION_BADGING; -import android.app.NotificationChannel; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java index 94419c49287..073d721ec8e 100644 --- a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java +++ b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java @@ -16,6 +16,8 @@ package com.android.settings.notification; +import static android.provider.Settings.Secure.NOTIFICATION_BADGING; + import android.content.ContentResolver; import android.content.Context; import android.content.Intent; @@ -23,16 +25,15 @@ import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; import android.provider.Settings; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; -import android.text.TextUtils; +import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.TogglePreferenceController; -import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settings.R; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.InlineSwitchPayload; import com.android.settings.search.ResultPayload; @@ -40,8 +41,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import static android.provider.Settings.Secure.NOTIFICATION_BADGING; - public class BadgingNotificationPreferenceController extends TogglePreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/notification/BlockPreferenceController.java b/src/com/android/settings/notification/BlockPreferenceController.java index 65d31193984..9e4c4632004 100644 --- a/src/com/android/settings/notification/BlockPreferenceController.java +++ b/src/com/android/settings/notification/BlockPreferenceController.java @@ -16,16 +16,16 @@ package com.android.settings.notification; -import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; import android.app.NotificationManager; import android.content.Context; -import androidx.preference.Preference; import android.widget.Switch; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/BootSoundPreferenceController.java b/src/com/android/settings/notification/BootSoundPreferenceController.java index 97639b1cd56..a6871639a7f 100644 --- a/src/com/android/settings/notification/BootSoundPreferenceController.java +++ b/src/com/android/settings/notification/BootSoundPreferenceController.java @@ -18,10 +18,12 @@ package com.android.settings.notification; import android.content.Context; import android.os.SystemProperties; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/notification/ChannelGroupNotificationSettings.java b/src/com/android/settings/notification/ChannelGroupNotificationSettings.java index c17b3b07005..17710c4c58e 100644 --- a/src/com/android/settings/notification/ChannelGroupNotificationSettings.java +++ b/src/com/android/settings/notification/ChannelGroupNotificationSettings.java @@ -18,9 +18,10 @@ package com.android.settings.notification; import android.app.NotificationChannel; import android.content.Context; -import androidx.preference.Preference; 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; diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java index 0ea0eaccff8..3580967b461 100644 --- a/src/com/android/settings/notification/ChannelNotificationSettings.java +++ b/src/com/android/settings/notification/ChannelNotificationSettings.java @@ -20,14 +20,14 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; 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.settings.applications.AppInfoBase; import com.android.settingslib.core.AbstractPreferenceController; import java.util.ArrayList; diff --git a/src/com/android/settings/notification/ChargingSoundPreferenceController.java b/src/com/android/settings/notification/ChargingSoundPreferenceController.java index e280177ce6d..fccde6a56e3 100644 --- a/src/com/android/settings/notification/ChargingSoundPreferenceController.java +++ b/src/com/android/settings/notification/ChargingSoundPreferenceController.java @@ -19,8 +19,8 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_GLOBAL; import android.content.Context; - import android.provider.Settings.Global; + import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java index bd7a82ae8e2..b396073e8f6 100644 --- a/src/com/android/settings/notification/ConfigureNotificationSettings.java +++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java @@ -24,16 +24,15 @@ import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; import android.provider.SearchIndexableResource; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.text.TextUtils; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.RingtonePreference; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.SummaryLoader; -import com.android.settings.gestures.SwipeToNotificationPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/notification/DefaultNotificationTonePreference.java b/src/com/android/settings/notification/DefaultNotificationTonePreference.java index 3a7d3b1922a..4a2e0b610d2 100644 --- a/src/com/android/settings/notification/DefaultNotificationTonePreference.java +++ b/src/com/android/settings/notification/DefaultNotificationTonePreference.java @@ -17,25 +17,15 @@ package com.android.settings.notification; -import com.android.settings.DefaultRingtonePreference; -import com.android.settings.Utils; - -import android.content.ContentResolver; import android.content.Context; import android.content.Intent; -import android.database.Cursor; -import android.database.sqlite.SQLiteException; import android.media.Ringtone; import android.media.RingtoneManager; -import android.os.AsyncTask; -import android.os.UserHandle; -import android.os.UserManager; import android.net.Uri; -import android.provider.MediaStore; -import android.provider.OpenableColumns; +import android.os.AsyncTask; import android.util.AttributeSet; -import static android.content.ContentProvider.getUriWithoutUserId; +import com.android.settings.DefaultRingtonePreference; public class DefaultNotificationTonePreference extends DefaultRingtonePreference { private Uri mRingtone; diff --git a/src/com/android/settings/notification/DeletedChannelsPreferenceController.java b/src/com/android/settings/notification/DeletedChannelsPreferenceController.java index 1ebc01c1337..14e0c84e2f8 100644 --- a/src/com/android/settings/notification/DeletedChannelsPreferenceController.java +++ b/src/com/android/settings/notification/DeletedChannelsPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/notification/DescriptionPreferenceController.java b/src/com/android/settings/notification/DescriptionPreferenceController.java index 61a9ddb96c5..1e996463aa0 100644 --- a/src/com/android/settings/notification/DescriptionPreferenceController.java +++ b/src/com/android/settings/notification/DescriptionPreferenceController.java @@ -17,9 +17,10 @@ package com.android.settings.notification; import android.content.Context; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; public class DescriptionPreferenceController extends NotificationPreferenceController diff --git a/src/com/android/settings/notification/DialPadTonePreferenceController.java b/src/com/android/settings/notification/DialPadTonePreferenceController.java index e0ca2996834..1b05ce21187 100644 --- a/src/com/android/settings/notification/DialPadTonePreferenceController.java +++ b/src/com/android/settings/notification/DialPadTonePreferenceController.java @@ -19,8 +19,8 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_SYSTEM; import android.content.Context; - import android.provider.Settings.System; + import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/DndPreferenceController.java b/src/com/android/settings/notification/DndPreferenceController.java index acbc0704bb4..a615221dff9 100644 --- a/src/com/android/settings/notification/DndPreferenceController.java +++ b/src/com/android/settings/notification/DndPreferenceController.java @@ -17,15 +17,12 @@ package com.android.settings.notification; import android.app.NotificationChannel; -import android.app.NotificationManager; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedSwitchPreference; -import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.core.lifecycle.LifecycleObserver; -import com.android.settingslib.core.lifecycle.events.OnResume; public class DndPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/DockAudioMediaPreferenceController.java b/src/com/android/settings/notification/DockAudioMediaPreferenceController.java index f7f13c58ff5..d9367d58ab2 100644 --- a/src/com/android/settings/notification/DockAudioMediaPreferenceController.java +++ b/src/com/android/settings/notification/DockAudioMediaPreferenceController.java @@ -19,10 +19,9 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_GLOBAL; import android.content.Context; - import android.content.res.Resources; import android.provider.Settings.Global; -import android.telephony.TelephonyManager; + import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/DockingSoundPreferenceController.java b/src/com/android/settings/notification/DockingSoundPreferenceController.java index 476fd6a990e..f3a281ec4cd 100644 --- a/src/com/android/settings/notification/DockingSoundPreferenceController.java +++ b/src/com/android/settings/notification/DockingSoundPreferenceController.java @@ -20,6 +20,7 @@ import static com.android.settings.notification.SettingPref.TYPE_GLOBAL; import android.content.Context; import android.provider.Settings.Global; + import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java index e67de2b48c0..7add167ab8e 100644 --- a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java +++ b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.UserHandle; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/notification/EmergencyTonePreferenceController.java b/src/com/android/settings/notification/EmergencyTonePreferenceController.java index a67ec8aac30..9c2a9584eb2 100644 --- a/src/com/android/settings/notification/EmergencyTonePreferenceController.java +++ b/src/com/android/settings/notification/EmergencyTonePreferenceController.java @@ -19,10 +19,10 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_GLOBAL; import android.content.Context; - import android.content.res.Resources; import android.provider.Settings.Global; import android.telephony.TelephonyManager; + import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/EmptyTextSettings.java b/src/com/android/settings/notification/EmptyTextSettings.java index 3f8ccc63097..4ac3d52d1d5 100644 --- a/src/com/android/settings/notification/EmptyTextSettings.java +++ b/src/com/android/settings/notification/EmptyTextSettings.java @@ -24,7 +24,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; import android.widget.TextView; -import com.android.settings.R; + import com.android.settings.SettingsPreferenceFragment; public abstract class EmptyTextSettings extends SettingsPreferenceFragment { diff --git a/src/com/android/settings/notification/HeaderPreferenceController.java b/src/com/android/settings/notification/HeaderPreferenceController.java index 29b8670a6a8..dc8b557be48 100644 --- a/src/com/android/settings/notification/HeaderPreferenceController.java +++ b/src/com/android/settings/notification/HeaderPreferenceController.java @@ -19,17 +19,17 @@ package com.android.settings.notification; import static com.android.settings.widget.EntityHeaderController.PREF_KEY_APP_HEADER; import android.app.Activity; -import androidx.lifecycle.LifecycleObserver; -import androidx.lifecycle.OnLifecycleEvent; import android.content.Context; -import androidx.preference.PreferenceFragment; -import androidx.preference.Preference; import android.text.BidiFormatter; import android.text.SpannableStringBuilder; import android.text.TextUtils; -import android.util.Slog; import android.view.View; +import androidx.lifecycle.LifecycleObserver; +import androidx.lifecycle.OnLifecycleEvent; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/ImportancePreferenceController.java b/src/com/android/settings/notification/ImportancePreferenceController.java index c05647240fc..4c20a46409d 100644 --- a/src/com/android/settings/notification/ImportancePreferenceController.java +++ b/src/com/android/settings/notification/ImportancePreferenceController.java @@ -26,6 +26,7 @@ import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.media.RingtoneManager; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/notification/LightsPreferenceController.java b/src/com/android/settings/notification/LightsPreferenceController.java index 3710cc5a996..04f25510c2e 100644 --- a/src/com/android/settings/notification/LightsPreferenceController.java +++ b/src/com/android/settings/notification/LightsPreferenceController.java @@ -16,17 +16,14 @@ package com.android.settings.notification; -import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedSwitchPreference; -import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.core.lifecycle.LifecycleObserver; -import com.android.settingslib.core.lifecycle.events.OnResume; public class LightsPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java index 518d2a949bb..d708edfb53b 100644 --- a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java +++ b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java @@ -28,11 +28,12 @@ import android.os.Handler; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.RestrictedListPreference; diff --git a/src/com/android/settings/notification/NotificationAppPreference.java b/src/com/android/settings/notification/NotificationAppPreference.java index bb015ca3f25..dfa3e36800b 100644 --- a/src/com/android/settings/notification/NotificationAppPreference.java +++ b/src/com/android/settings/notification/NotificationAppPreference.java @@ -16,11 +16,12 @@ package com.android.settings.notification; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.widget.Switch; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.widget.MasterSwitchPreference; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/notification/NotificationFooterPreference.java b/src/com/android/settings/notification/NotificationFooterPreference.java index 2b41281c510..abaffc85941 100644 --- a/src/com/android/settings/notification/NotificationFooterPreference.java +++ b/src/com/android/settings/notification/NotificationFooterPreference.java @@ -17,13 +17,14 @@ package com.android.settings.notification; import android.content.Context; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.method.LinkMovementMethod; import android.util.AttributeSet; import android.widget.TextView; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settingslib.R; /** diff --git a/src/com/android/settings/notification/NotificationLockscreenPreference.java b/src/com/android/settings/notification/NotificationLockscreenPreference.java index 01eecf52ed7..b3f39f9a739 100644 --- a/src/com/android/settings/notification/NotificationLockscreenPreference.java +++ b/src/com/android/settings/notification/NotificationLockscreenPreference.java @@ -16,11 +16,6 @@ package com.android.settings.notification; -import com.android.settings.R; -import com.android.settings.RestrictedListPreference; -import com.android.settings.Utils; -import com.android.settingslib.RestrictedLockUtils; - import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; @@ -33,10 +28,14 @@ import android.util.AttributeSet; import android.view.View; import android.widget.CheckBox; import android.widget.CompoundButton; -import android.widget.ImageView; import android.widget.ListAdapter; import android.widget.ListView; +import com.android.settings.R; +import com.android.settings.RestrictedListPreference; +import com.android.settings.Utils; +import com.android.settingslib.RestrictedLockUtils; + public class NotificationLockscreenPreference extends RestrictedListPreference { private boolean mAllowRemoteInput; diff --git a/src/com/android/settings/notification/NotificationPreferenceController.java b/src/com/android/settings/notification/NotificationPreferenceController.java index 49bb08ef154..0b3db1505a4 100644 --- a/src/com/android/settings/notification/NotificationPreferenceController.java +++ b/src/com/android/settings/notification/NotificationPreferenceController.java @@ -25,10 +25,10 @@ import android.app.NotificationManager; import android.content.Context; import android.content.pm.PackageManager; import android.os.UserManager; +import android.util.Log; + import androidx.preference.Preference; import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; -import android.util.Log; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java index 6006162955b..50caaf83000 100644 --- a/src/com/android/settings/notification/NotificationSettingsBase.java +++ b/src/com/android/settings/notification/NotificationSettingsBase.java @@ -18,9 +18,9 @@ package com.android.settings.notification; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; + import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; -import android.app.Activity; import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationChannelGroup; @@ -37,13 +37,14 @@ import android.content.pm.ResolveInfo; import android.os.Bundle; import android.os.UserHandle; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.applications.AppInfoBase; diff --git a/src/com/android/settings/notification/NotificationStation.java b/src/com/android/settings/notification/NotificationStation.java index e63e5886461..d3ebc08f77a 100644 --- a/src/com/android/settings/notification/NotificationStation.java +++ b/src/com/android/settings/notification/NotificationStation.java @@ -39,9 +39,6 @@ import android.service.notification.NotificationListenerService; import android.service.notification.NotificationListenerService.Ranking; import android.service.notification.NotificationListenerService.RankingMap; import android.service.notification.StatusBarNotification; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; -import androidx.recyclerview.widget.RecyclerView; import android.text.SpannableString; import android.text.SpannableStringBuilder; import android.text.TextUtils; @@ -52,6 +49,10 @@ import android.widget.DateTimeView; import android.widget.ImageView; import android.widget.TextView; +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; @@ -60,7 +61,6 @@ import com.android.settings.Utils; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.Date; import java.util.List; public class NotificationStation extends SettingsPreferenceFragment { diff --git a/src/com/android/settings/notification/NotificationSwitchBarPreference.java b/src/com/android/settings/notification/NotificationSwitchBarPreference.java index ede7d881f96..ff429879925 100644 --- a/src/com/android/settings/notification/NotificationSwitchBarPreference.java +++ b/src/com/android/settings/notification/NotificationSwitchBarPreference.java @@ -17,10 +17,11 @@ package com.android.settings.notification; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.applications.LayoutPreference; import com.android.settings.widget.ToggleSwitch; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/notification/NotificationsOffPreferenceController.java b/src/com/android/settings/notification/NotificationsOffPreferenceController.java index 4dbf4917641..8762f91c271 100644 --- a/src/com/android/settings/notification/NotificationsOffPreferenceController.java +++ b/src/com/android/settings/notification/NotificationsOffPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/notification/PhoneRingtonePreferenceController.java b/src/com/android/settings/notification/PhoneRingtonePreferenceController.java index cb1115165fe..049dfe51b60 100644 --- a/src/com/android/settings/notification/PhoneRingtonePreferenceController.java +++ b/src/com/android/settings/notification/PhoneRingtonePreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import android.content.Context; import android.media.RingtoneManager; + import com.android.settings.Utils; public class PhoneRingtonePreferenceController extends RingtonePreferenceControllerBase { diff --git a/src/com/android/settings/notification/PulseNotificationPreferenceController.java b/src/com/android/settings/notification/PulseNotificationPreferenceController.java index 15bbf6d115b..63fe7463ac7 100644 --- a/src/com/android/settings/notification/PulseNotificationPreferenceController.java +++ b/src/com/android/settings/notification/PulseNotificationPreferenceController.java @@ -16,16 +16,19 @@ package com.android.settings.notification; +import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE; + import android.content.ContentResolver; import android.content.Context; import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; import android.provider.Settings; +import android.util.Log; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; -import android.util.Log; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -33,8 +36,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE; - public class PulseNotificationPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java index 8081e4e943f..e1132019223 100644 --- a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java +++ b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java @@ -24,16 +24,17 @@ import android.content.pm.PackageManager; import android.os.Bundle; import android.os.UserHandle; import android.service.notification.NotifyingApp; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.ArrayMap; import android.util.ArraySet; import android.util.IconDrawableFactory; import android.util.Log; +import androidx.annotation.VisibleForTesting; +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; diff --git a/src/com/android/settings/notification/RingVolumePreferenceController.java b/src/com/android/settings/notification/RingVolumePreferenceController.java index becf95fece7..75ad4a701df 100644 --- a/src/com/android/settings/notification/RingVolumePreferenceController.java +++ b/src/com/android/settings/notification/RingVolumePreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import android.app.NotificationManager; -import androidx.lifecycle.OnLifecycleEvent; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -30,6 +29,8 @@ import android.os.Message; import android.os.Vibrator; import android.text.TextUtils; +import androidx.lifecycle.OnLifecycleEvent; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/RingtonePreferenceControllerBase.java b/src/com/android/settings/notification/RingtonePreferenceControllerBase.java index 21b7e539a18..7d5ebf13347 100644 --- a/src/com/android/settings/notification/RingtonePreferenceControllerBase.java +++ b/src/com/android/settings/notification/RingtonePreferenceControllerBase.java @@ -20,6 +20,7 @@ import android.content.Context; import android.media.Ringtone; import android.media.RingtoneManager; import android.net.Uri; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java b/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java index 11aaa92dd01..896d99e1ed9 100644 --- a/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java +++ b/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java @@ -19,8 +19,8 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_SYSTEM; import android.content.Context; - import android.provider.Settings.System; + import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/SettingPref.java b/src/com/android/settings/notification/SettingPref.java index 08031b12fbb..2cd2a137ce7 100644 --- a/src/com/android/settings/notification/SettingPref.java +++ b/src/com/android/settings/notification/SettingPref.java @@ -22,6 +22,7 @@ import android.content.res.Resources; import android.net.Uri; import android.provider.Settings.Global; import android.provider.Settings.System; + import androidx.preference.DropDownPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; diff --git a/src/com/android/settings/notification/SettingPrefController.java b/src/com/android/settings/notification/SettingPrefController.java index 891c7b3f8fa..9d54190f225 100644 --- a/src/com/android/settings/notification/SettingPrefController.java +++ b/src/com/android/settings/notification/SettingPrefController.java @@ -18,10 +18,10 @@ package com.android.settings.notification; import android.content.ContentResolver; import android.content.Context; - import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/SoundPreferenceController.java b/src/com/android/settings/notification/SoundPreferenceController.java index 6c537ff0d26..d0b098c8d60 100644 --- a/src/com/android/settings/notification/SoundPreferenceController.java +++ b/src/com/android/settings/notification/SoundPreferenceController.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.preference.PreferenceManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java index 4e8218fbb56..0b12b21c306 100644 --- a/src/com/android/settings/notification/SoundSettings.java +++ b/src/com/android/settings/notification/SoundSettings.java @@ -25,10 +25,11 @@ import android.os.Message; import android.os.UserHandle; import android.preference.SeekBarVolumizer; import android.provider.SearchIndexableResource; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; -import android.text.TextUtils; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/notification/SuppressorHelper.java b/src/com/android/settings/notification/SuppressorHelper.java index 837517ca82a..d3a017c4c64 100644 --- a/src/com/android/settings/notification/SuppressorHelper.java +++ b/src/com/android/settings/notification/SuppressorHelper.java @@ -20,9 +20,10 @@ import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + public class SuppressorHelper { private static final String TAG = "SuppressorHelper"; diff --git a/src/com/android/settings/notification/TouchSoundPreferenceController.java b/src/com/android/settings/notification/TouchSoundPreferenceController.java index 20c9cee0d05..608cf677965 100644 --- a/src/com/android/settings/notification/TouchSoundPreferenceController.java +++ b/src/com/android/settings/notification/TouchSoundPreferenceController.java @@ -19,10 +19,10 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_SYSTEM; import android.content.Context; - import android.media.AudioManager; import android.os.AsyncTask; import android.provider.Settings.System; + import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java b/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java index acb6b4d52c3..0ae4c03040b 100644 --- a/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java +++ b/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java @@ -21,6 +21,7 @@ import static com.android.settings.notification.SettingPref.TYPE_SYSTEM; import android.content.Context; import android.os.Vibrator; import android.provider.Settings.System; + import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java index 3d9557e3470..ae111b20812 100644 --- a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java +++ b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java @@ -24,9 +24,10 @@ import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; import android.provider.Settings; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.Utils; import com.android.settings.core.TogglePreferenceController; diff --git a/src/com/android/settings/notification/VibrationPreferenceController.java b/src/com/android/settings/notification/VibrationPreferenceController.java index 04aa201a587..ec5554a9d45 100644 --- a/src/com/android/settings/notification/VibrationPreferenceController.java +++ b/src/com/android/settings/notification/VibrationPreferenceController.java @@ -16,10 +16,10 @@ package com.android.settings.notification; -import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.os.Vibrator; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/VisibilityPreferenceController.java b/src/com/android/settings/notification/VisibilityPreferenceController.java index e1b067bc378..114759cd3f0 100644 --- a/src/com/android/settings/notification/VisibilityPreferenceController.java +++ b/src/com/android/settings/notification/VisibilityPreferenceController.java @@ -25,6 +25,7 @@ import android.content.pm.UserInfo; import android.os.UserHandle; import android.provider.Settings; import android.service.notification.NotificationListenerService; + import androidx.preference.Preference; import com.android.internal.widget.LockPatternUtils; diff --git a/src/com/android/settings/notification/VolumeSeekBarPreference.java b/src/com/android/settings/notification/VolumeSeekBarPreference.java index ee02b628b08..2ef33d4ab04 100644 --- a/src/com/android/settings/notification/VolumeSeekBarPreference.java +++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java @@ -21,16 +21,16 @@ import android.content.Context; import android.media.AudioManager; import android.net.Uri; import android.preference.SeekBarVolumizer; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; -import android.util.Log; import android.view.View; import android.widget.ImageView; import android.widget.SeekBar; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.widget.SeekBarPreference; diff --git a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java index 720fddd7208..941f5bd8993 100644 --- a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java +++ b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java @@ -16,9 +16,10 @@ package com.android.settings.notification; +import android.content.Context; + import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; -import android.content.Context; import androidx.preference.PreferenceScreen; import com.android.internal.annotations.VisibleForTesting; diff --git a/src/com/android/settings/notification/WorkSoundPreferenceController.java b/src/com/android/settings/notification/WorkSoundPreferenceController.java index 108fbcaa2e8..363f0f0d2e8 100644 --- a/src/com/android/settings/notification/WorkSoundPreferenceController.java +++ b/src/com/android/settings/notification/WorkSoundPreferenceController.java @@ -32,6 +32,7 @@ import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceGroup; diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java index 62c9315f8ab..83e40225d4f 100644 --- a/src/com/android/settings/notification/ZenAccessSettings.java +++ b/src/com/android/settings/notification/ZenAccessSettings.java @@ -37,15 +37,16 @@ import android.os.Handler; import android.os.Looper; import android.os.RemoteException; import android.provider.Settings.Secure; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.ArraySet; import android.util.Log; import android.view.View; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java b/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java index 388b40d14b3..e432fb083ad 100644 --- a/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java +++ b/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java @@ -25,11 +25,12 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.service.notification.ZenModeConfig; -import androidx.preference.PreferenceFragment; -import androidx.preference.Preference; import android.util.Slog; import android.view.View; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java b/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java index 599af268247..a284db760f7 100644 --- a/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java +++ b/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java @@ -19,9 +19,10 @@ package com.android.settings.notification; import android.app.AutomaticZenRule; import android.app.Fragment; import android.content.Context; +import android.widget.Switch; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.widget.Switch; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java b/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java index c28b7b44563..000a7563206 100644 --- a/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java +++ b/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java @@ -17,11 +17,12 @@ package com.android.settings.notification; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.widget.RadioButton; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.TwoTargetPreference; diff --git a/src/com/android/settings/notification/ZenFooterPreferenceController.java b/src/com/android/settings/notification/ZenFooterPreferenceController.java index a00ac6a346c..15a2252397c 100644 --- a/src/com/android/settings/notification/ZenFooterPreferenceController.java +++ b/src/com/android/settings/notification/ZenFooterPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java b/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java index 8898b055c24..d7b9db6aa69 100644 --- a/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java @@ -19,11 +19,12 @@ package com.android.settings.notification; import android.app.Fragment; import android.content.Context; import android.content.Intent; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settings.utils.ZenServiceListing; +import com.android.settingslib.core.lifecycle.Lifecycle; public class ZenModeAddAutomaticRulePreferenceController extends AbstractZenModeAutomaticRulePreferenceController implements diff --git a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java b/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java index 70c1ae905e2..96495dfbf76 100644 --- a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; 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; diff --git a/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java b/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java index 2ea46392c7b..dc9d6fefe1f 100644 --- a/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.notification; import android.app.AutomaticZenRule; import android.app.Fragment; import android.content.Context; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; diff --git a/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java b/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java index faa0f8a1960..4220a42c7fd 100644 --- a/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/ZenModeBackend.java b/src/com/android/settings/notification/ZenModeBackend.java index 8c8f14df671..e239b1a3c9d 100644 --- a/src/com/android/settings/notification/ZenModeBackend.java +++ b/src/com/android/settings/notification/ZenModeBackend.java @@ -26,9 +26,10 @@ import android.content.Context; import android.net.Uri; import android.provider.Settings; import android.service.notification.ZenModeConfig; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; public class ZenModeBackend { diff --git a/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java index 4ab14379e92..0dba4d6dd5d 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java index 6a0b657b23f..e9f74d2880c 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java @@ -21,6 +21,7 @@ import android.content.Context; import android.net.Uri; import android.provider.Settings; import android.service.notification.ZenModeConfig; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java index d11baee8e8b..2046244c622 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java index 3d250639e18..425f7709374 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceController.java b/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceController.java index b017cac3157..08c4ca7975b 100644 --- a/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceController.java @@ -17,7 +17,6 @@ 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; diff --git a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java b/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java index aa2b55ccbfd..4e11a9cf4d6 100644 --- a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java +++ b/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java @@ -27,7 +27,6 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BA import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; -import androidx.preference.CheckBoxPreference; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenModeButtonPreferenceController.java b/src/com/android/settings/notification/ZenModeButtonPreferenceController.java index ac9497dbe3b..215cdd1ebf6 100644 --- a/src/com/android/settings/notification/ZenModeButtonPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeButtonPreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.notification; import android.app.FragmentManager; import android.content.Context; import android.provider.Settings; -import androidx.preference.Preference; import android.view.View; import android.widget.Button; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java index 1b6c122be44..aceb6b998b1 100644 --- a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.notification; import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; +import android.text.TextUtils; + import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenModeDurationPreferenceController.java b/src/com/android/settings/notification/ZenModeDurationPreferenceController.java index 5e58444efbd..ccd4d571602 100644 --- a/src/com/android/settings/notification/ZenModeDurationPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeDurationPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import android.app.FragmentManager; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeEventRuleSettings.java b/src/com/android/settings/notification/ZenModeEventRuleSettings.java index 51ea51780d5..3dd9afb4e4a 100644 --- a/src/com/android/settings/notification/ZenModeEventRuleSettings.java +++ b/src/com/android/settings/notification/ZenModeEventRuleSettings.java @@ -26,6 +26,7 @@ import android.provider.CalendarContract.Calendars; import android.provider.Settings; import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig.EventInfo; + import androidx.preference.DropDownPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; diff --git a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java b/src/com/android/settings/notification/ZenModeEventsPreferenceController.java index 8ca6cf63dfd..235ebd5b004 100644 --- a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeEventsPreferenceController.java @@ -19,10 +19,10 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; 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; diff --git a/src/com/android/settings/notification/ZenModeMediaPreferenceController.java b/src/com/android/settings/notification/ZenModeMediaPreferenceController.java index d8099bed210..2bec84f9c75 100644 --- a/src/com/android/settings/notification/ZenModeMediaPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeMediaPreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settingslib.core.lifecycle.Lifecycle; public class ZenModeMediaPreferenceController extends AbstractZenModePreferenceController diff --git a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java b/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java index 5939abbce53..f57c19304cb 100644 --- a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java @@ -3,10 +3,11 @@ package com.android.settings.notification; import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; +import android.text.TextUtils; + import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenModePreferenceController.java b/src/com/android/settings/notification/ZenModePreferenceController.java index 0d94029f47c..edd531a3b5e 100644 --- a/src/com/android/settings/notification/ZenModePreferenceController.java +++ b/src/com/android/settings/notification/ZenModePreferenceController.java @@ -23,9 +23,9 @@ import android.net.Uri; import android.os.Handler; import android.os.UserHandle; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Slog; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java b/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java index c0f319afaf6..41f1eb1c6ec 100644 --- a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.notification; import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; 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; diff --git a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java b/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java index e3f5c2f7ac4..db5c6e1b3e8 100644 --- a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; +import android.util.Log; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Log; +import androidx.preference.SwitchPreference; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java index 576da167295..9e5dbc33042 100644 --- a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java +++ b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java @@ -23,11 +23,12 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; import android.service.notification.ConditionProviderService; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.util.Log; import android.widget.Toast; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java index 50ecd8bd09e..cd1c6f55dfa 100644 --- a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java +++ b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java @@ -28,14 +28,15 @@ import android.os.Bundle; import android.provider.Settings; import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig.ScheduleInfo; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceScreen; import android.text.format.DateFormat; import android.util.Log; import android.widget.TimePicker; +import androidx.preference.Preference; +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; diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index 232502ec222..ce8c8292f27 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -34,6 +34,7 @@ import android.icu.text.ListFormatter; import android.provider.SearchIndexableResource; import android.provider.Settings; import android.service.notification.ZenModeConfig; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java b/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java index c21f23dac6e..6d5aac915da 100644 --- a/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java @@ -20,6 +20,7 @@ import android.content.Context; import android.net.Uri; import android.provider.Settings; import android.service.notification.ZenModeConfig; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenModeSliceBuilder.java b/src/com/android/settings/notification/ZenModeSliceBuilder.java index bf47154a1d6..da866af13d4 100644 --- a/src/com/android/settings/notification/ZenModeSliceBuilder.java +++ b/src/com/android/settings/notification/ZenModeSliceBuilder.java @@ -18,8 +18,6 @@ package com.android.settings.notification; import static android.app.slice.Slice.EXTRA_TOGGLE_STATE; -import static androidx.slice.builders.ListBuilder.ICON_IMAGE; - import android.annotation.ColorInt; import android.app.NotificationManager; import android.app.PendingIntent; @@ -31,6 +29,11 @@ import android.net.Uri; import android.provider.Settings; import android.provider.SettingsSlicesContract; +import androidx.core.graphics.drawable.IconCompat; +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; @@ -38,13 +41,6 @@ import com.android.settings.Utils; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.slices.SliceBroadcastReceiver; -import com.android.settings.slices.SliceBuilderUtils; - -import androidx.slice.Slice; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.SliceAction; - -import androidx.core.graphics.drawable.IconCompat; public class ZenModeSliceBuilder { diff --git a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java b/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java index bab16619ea2..9c142132365 100644 --- a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java @@ -27,6 +27,7 @@ import android.database.Cursor; import android.icu.text.ListFormatter; import android.provider.Contacts; import android.provider.ContactsContract; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeSystemPreferenceController.java b/src/com/android/settings/notification/ZenModeSystemPreferenceController.java index b41f11e3cf3..73907b9fffd 100644 --- a/src/com/android/settings/notification/ZenModeSystemPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeSystemPreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; 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; diff --git a/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java index 4c49224bc77..e3098f0e22f 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java @@ -18,13 +18,14 @@ package com.android.settings.notification; import android.app.NotificationManager; import android.content.Context; + import androidx.preference.CheckBoxPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settings.widget.DisabledCheckBoxPreference; +import com.android.settingslib.core.lifecycle.Lifecycle; public class ZenModeVisEffectPreferenceController extends AbstractZenModePreferenceController diff --git a/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java index 2af7866450b..cd1a08a1ab1 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java index c015d9d8f22..7077bab6276 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java index 3fd5420f6a7..0ce293dee3b 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeVoiceActivity.java b/src/com/android/settings/notification/ZenModeVoiceActivity.java index db8de69f862..0a52c3da0b4 100644 --- a/src/com/android/settings/notification/ZenModeVoiceActivity.java +++ b/src/com/android/settings/notification/ZenModeVoiceActivity.java @@ -16,6 +16,9 @@ package com.android.settings.notification; +import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_ENABLED; +import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_MINUTES; + import android.app.NotificationManager; import android.content.Context; import android.content.Intent; @@ -33,9 +36,6 @@ import com.android.settings.utils.VoiceSettingsActivity; import java.util.Locale; -import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_ENABLED; -import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_MINUTES; - /** * Activity for modifying the Zen mode (Do not disturb) by voice * using the Voice Interaction API. diff --git a/src/com/android/settings/notification/ZenRulePreference.java b/src/com/android/settings/notification/ZenRulePreference.java index 1bb1538f014..03ea257c775 100644 --- a/src/com/android/settings/notification/ZenRulePreference.java +++ b/src/com/android/settings/notification/ZenRulePreference.java @@ -24,9 +24,10 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; import android.service.notification.ZenModeConfig; +import android.view.View; + import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; -import android.view.View; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java index 89e1eb8eda4..8bc252a0be5 100644 --- a/src/com/android/settings/overlay/FeatureFactoryImpl.java +++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java @@ -21,6 +21,7 @@ import android.app.admin.DevicePolicyManager; import android.content.Context; import android.net.ConnectivityManager; import android.os.UserManager; + import androidx.annotation.Keep; import com.android.settings.accounts.AccountFeatureProvider; diff --git a/src/com/android/settings/overlay/SupportFeatureProvider.java b/src/com/android/settings/overlay/SupportFeatureProvider.java index ad68a748e62..0988fd43aa0 100644 --- a/src/com/android/settings/overlay/SupportFeatureProvider.java +++ b/src/com/android/settings/overlay/SupportFeatureProvider.java @@ -19,18 +19,13 @@ package com.android.settings.overlay; import android.accounts.Account; import android.annotation.IntDef; import android.annotation.NonNull; -import android.annotation.StringRes; import android.app.Activity; -import android.app.FragmentManager; import android.content.Context; -import android.content.Intent; -import android.os.Bundle; import com.android.settings.support.SupportPhone; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import java.util.List; /** * Feature provider for support tab. diff --git a/src/com/android/settings/overlay/SurveyFeatureProvider.java b/src/com/android/settings/overlay/SurveyFeatureProvider.java index d078d39247c..44ee525060e 100644 --- a/src/com/android/settings/overlay/SurveyFeatureProvider.java +++ b/src/com/android/settings/overlay/SurveyFeatureProvider.java @@ -18,7 +18,7 @@ package com.android.settings.overlay; import android.app.Activity; import android.content.BroadcastReceiver; import android.content.Context; -import android.content.IntentFilter; + import androidx.annotation.Nullable; import androidx.localbroadcastmanager.content.LocalBroadcastManager; diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java index add05e4e4a5..4a1d50e94d8 100644 --- a/src/com/android/settings/password/ChooseLockGeneric.java +++ b/src/com/android/settings/password/ChooseLockGeneric.java @@ -19,7 +19,8 @@ package com.android.settings.password; import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PARENT_PROFILE_PASSWORD; import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PASSWORD; -import static com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment.RESULT_FINISHED; +import static com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment + .RESULT_FINISHED; import android.accessibilityservice.AccessibilityServiceInfo; import android.app.Activity; @@ -39,15 +40,16 @@ import android.os.UserHandle; import android.os.UserManager; import android.os.storage.StorageManager; import android.security.KeyStore; -import androidx.annotation.StringRes; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.EventLog; import android.util.Log; import android.view.accessibility.AccessibilityManager; import android.widget.TextView; +import androidx.annotation.StringRes; +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; diff --git a/src/com/android/settings/password/ChooseLockGenericController.java b/src/com/android/settings/password/ChooseLockGenericController.java index 2550510a3e6..98e81a83a3d 100644 --- a/src/com/android/settings/password/ChooseLockGenericController.java +++ b/src/com/android/settings/password/ChooseLockGenericController.java @@ -19,6 +19,7 @@ package com.android.settings.password; import android.app.admin.DevicePolicyManager; import android.content.Context; import android.os.UserHandle; + import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java index 1913ec68727..4fad4eb28cc 100644 --- a/src/com/android/settings/password/ChooseLockPassword.java +++ b/src/com/android/settings/password/ChooseLockPassword.java @@ -34,9 +34,6 @@ import android.graphics.Typeface; import android.os.Bundle; import android.os.Handler; import android.os.Message; -import androidx.annotation.StringRes; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.text.Editable; import android.text.InputType; import android.text.Selection; @@ -55,6 +52,10 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; +import androidx.annotation.StringRes; +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; diff --git a/src/com/android/settings/password/ManagedLockPasswordProvider.java b/src/com/android/settings/password/ManagedLockPasswordProvider.java index 5786a5afa09..2494af556ed 100644 --- a/src/com/android/settings/password/ManagedLockPasswordProvider.java +++ b/src/com/android/settings/password/ManagedLockPasswordProvider.java @@ -19,8 +19,6 @@ package com.android.settings.password; import android.content.Context; import android.content.Intent; -import com.android.settings.R; - /** * Helper for handling managed passwords in security settings UI. * It provides resources that should be shown in settings UI when lock password quality is set to diff --git a/src/com/android/settings/password/PasswordRequirementAdapter.java b/src/com/android/settings/password/PasswordRequirementAdapter.java index 0148ca55683..0e194afca16 100644 --- a/src/com/android/settings/password/PasswordRequirementAdapter.java +++ b/src/com/android/settings/password/PasswordRequirementAdapter.java @@ -16,12 +16,13 @@ package com.android.settings.password; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.password.PasswordRequirementAdapter.PasswordRequirementViewHolder; diff --git a/src/com/android/settings/password/SetNewPasswordController.java b/src/com/android/settings/password/SetNewPasswordController.java index a8d51eddd4a..d4227b2abaf 100644 --- a/src/com/android/settings/password/SetNewPasswordController.java +++ b/src/com/android/settings/password/SetNewPasswordController.java @@ -19,6 +19,7 @@ package com.android.settings.password; import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PASSWORD; import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING; + import static com.android.internal.util.Preconditions.checkNotNull; import android.annotation.Nullable; diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java index a72047308c2..9744365d8b6 100644 --- a/src/com/android/settings/password/SetupChooseLockGeneric.java +++ b/src/com/android/settings/password/SetupChooseLockGeneric.java @@ -22,14 +22,15 @@ import android.content.Intent; import android.content.res.Resources; import android.os.Bundle; import android.os.UserHandle; -import androidx.preference.PreferenceFragment; -import androidx.preference.Preference; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.SetupEncryptionInterstitial; diff --git a/src/com/android/settings/password/SetupChooseLockPassword.java b/src/com/android/settings/password/SetupChooseLockPassword.java index 56b66a324aa..452a34bdc6a 100644 --- a/src/com/android/settings/password/SetupChooseLockPassword.java +++ b/src/com/android/settings/password/SetupChooseLockPassword.java @@ -22,12 +22,13 @@ import android.app.admin.DevicePolicyManager; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.Nullable; import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.LinearLayout; +import androidx.annotation.Nullable; + import com.android.settings.R; import com.android.settings.SetupRedactionInterstitial; import com.android.settings.password.ChooseLockTypeDialogFragment.OnLockTypeSelectedListener; diff --git a/src/com/android/settings/password/SetupChooseLockPattern.java b/src/com/android/settings/password/SetupChooseLockPattern.java index 0b272f5b938..0fa5710c4c6 100644 --- a/src/com/android/settings/password/SetupChooseLockPattern.java +++ b/src/com/android/settings/password/SetupChooseLockPattern.java @@ -20,12 +20,13 @@ import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import androidx.annotation.Nullable; + import com.android.settings.R; import com.android.settings.SetupRedactionInterstitial; diff --git a/src/com/android/settings/password/SetupSkipDialog.java b/src/com/android/settings/password/SetupSkipDialog.java index f5396c4efd2..fdcdb2f77bf 100644 --- a/src/com/android/settings/password/SetupSkipDialog.java +++ b/src/com/android/settings/password/SetupSkipDialog.java @@ -22,6 +22,7 @@ import android.app.Dialog; import android.app.FragmentManager; import android.content.DialogInterface; import android.os.Bundle; + import androidx.annotation.NonNull; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java index bb50d0af259..ba0172ba560 100644 --- a/src/com/android/settings/print/PrintJobSettingsFragment.java +++ b/src/com/android/settings/print/PrintJobSettingsFragment.java @@ -25,7 +25,6 @@ import android.print.PrintJobId; import android.print.PrintJobInfo; import android.print.PrintManager; import android.print.PrintManager.PrintJobStateChangeListener; -import androidx.preference.Preference; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.Log; @@ -36,6 +35,8 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java index 3e3582397bd..a47bb978e9f 100644 --- a/src/com/android/settings/print/PrintServiceSettingsFragment.java +++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java @@ -44,8 +44,8 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; -import android.view.ViewGroup; import android.view.View.OnClickListener; +import android.view.ViewGroup; import android.view.accessibility.AccessibilityManager; import android.widget.AdapterView; import android.widget.BaseAdapter; diff --git a/src/com/android/settings/print/PrintSettingPreferenceController.java b/src/com/android/settings/print/PrintSettingPreferenceController.java index f40846a121f..16c432032f8 100644 --- a/src/com/android/settings/print/PrintSettingPreferenceController.java +++ b/src/com/android/settings/print/PrintSettingPreferenceController.java @@ -24,6 +24,7 @@ import android.print.PrintJobId; import android.print.PrintJobInfo; import android.print.PrintManager; import android.printservice.PrintServiceInfo; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java index b42be8f29e4..da0948b6424 100644 --- a/src/com/android/settings/print/PrintSettingsFragment.java +++ b/src/com/android/settings/print/PrintSettingsFragment.java @@ -39,8 +39,6 @@ import android.print.PrintServicesLoader; import android.printservice.PrintServiceInfo; import android.provider.SearchIndexableResource; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.Log; @@ -51,6 +49,9 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; +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; diff --git a/src/com/android/settings/search/BaseSearchIndexProvider.java b/src/com/android/settings/search/BaseSearchIndexProvider.java index 3864750a67b..f234bbe8edc 100644 --- a/src/com/android/settings/search/BaseSearchIndexProvider.java +++ b/src/com/android/settings/search/BaseSearchIndexProvider.java @@ -20,13 +20,14 @@ import android.annotation.XmlRes; import android.content.Context; import android.content.res.XmlResourceParser; import android.provider.SearchIndexableResource; -import androidx.annotation.CallSuper; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; import android.util.Xml; +import androidx.annotation.CallSuper; +import androidx.annotation.VisibleForTesting; + import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerListHelper; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/search/DatabaseIndexingManager.java b/src/com/android/settings/search/DatabaseIndexingManager.java index e793cac5475..a7f4005547f 100644 --- a/src/com/android/settings/search/DatabaseIndexingManager.java +++ b/src/com/android/settings/search/DatabaseIndexingManager.java @@ -55,11 +55,11 @@ import android.database.sqlite.SQLiteException; import android.os.Build; import android.provider.SearchIndexablesContract; import android.provider.SearchIndexablesContract.SiteMapColumns; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; -import com.android.settings.overlay.FeatureFactory; +import androidx.annotation.VisibleForTesting; + import com.android.settings.search.indexing.IndexData; import com.android.settings.search.indexing.IndexDataConverter; import com.android.settings.search.indexing.PreIndexData; diff --git a/src/com/android/settings/search/DeviceIndexUpdateJobService.java b/src/com/android/settings/search/DeviceIndexUpdateJobService.java index 3eb904119bc..0b12fe49cac 100644 --- a/src/com/android/settings/search/DeviceIndexUpdateJobService.java +++ b/src/com/android/settings/search/DeviceIndexUpdateJobService.java @@ -17,6 +17,7 @@ package com.android.settings.search; import static android.app.slice.Slice.HINT_LARGE; import static android.app.slice.Slice.HINT_TITLE; import static android.app.slice.SliceItem.FORMAT_TEXT; + import static com.android.settings.search.DeviceIndexFeatureProvider.createDeepLink; import android.app.job.JobParameters; @@ -28,6 +29,14 @@ import android.net.Uri.Builder; import android.provider.SettingsSlicesContract; import android.util.Log; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceViewManager; +import androidx.slice.SliceViewManager.SliceCallback; +import androidx.slice.core.SliceQuery; +import androidx.slice.widget.ListContent; + import com.android.internal.annotations.VisibleForTesting; import com.android.settings.overlay.FeatureFactory; import com.android.settings.slices.SettingsSliceProvider; @@ -36,14 +45,6 @@ import com.android.settings.slices.SliceDeepLinkSpringBoard; import java.util.Collection; import java.util.concurrent.CountDownLatch; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceViewManager; -import androidx.slice.SliceViewManager.SliceCallback; -import androidx.slice.SliceMetadata; -import androidx.slice.core.SliceQuery; -import androidx.slice.widget.ListContent; - public class DeviceIndexUpdateJobService extends JobService { private static final String TAG = "DeviceIndexUpdate"; diff --git a/src/com/android/settings/search/IndexDatabaseHelper.java b/src/com/android/settings/search/IndexDatabaseHelper.java index 7c87bf74f61..8ab9140a082 100644 --- a/src/com/android/settings/search/IndexDatabaseHelper.java +++ b/src/com/android/settings/search/IndexDatabaseHelper.java @@ -23,10 +23,11 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.os.Build; import android.provider.SearchIndexablesContract.SiteMapColumns; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import java.util.List; public class IndexDatabaseHelper extends SQLiteOpenHelper { diff --git a/src/com/android/settings/search/InlinePayload.java b/src/com/android/settings/search/InlinePayload.java index 1cb694a7cb6..fab1e3b7038 100644 --- a/src/com/android/settings/search/InlinePayload.java +++ b/src/com/android/settings/search/InlinePayload.java @@ -17,12 +17,10 @@ package com.android.settings.search; -import android.content.Intent; - import android.content.Context; +import android.content.Intent; import android.os.Parcel; import android.provider.Settings; -import com.android.internal.annotations.VisibleForTesting; /** * Abstract Payload for inline settings results. diff --git a/src/com/android/settings/search/SearchIndexableResourcesImpl.java b/src/com/android/settings/search/SearchIndexableResourcesImpl.java index 7d7606de00e..63e975f0dc0 100644 --- a/src/com/android/settings/search/SearchIndexableResourcesImpl.java +++ b/src/com/android/settings/search/SearchIndexableResourcesImpl.java @@ -21,11 +21,6 @@ import androidx.annotation.VisibleForTesting; import com.android.settings.DateTimeSettings; import com.android.settings.DisplaySettings; import com.android.settings.LegalSettings; -import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment; -import com.android.settings.connecteddevice.PreviouslyConnectedDeviceDashboardFragment; -import com.android.settings.connecteddevice.BluetoothDashboardFragment; -import com.android.settings.datausage.DataUsageSummaryLegacy; -import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment; import com.android.settings.accessibility.AccessibilitySettings; import com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment; import com.android.settings.accessibility.MagnificationPreferenceFragment; @@ -37,14 +32,19 @@ import com.android.settings.applications.SpecialAccessSettings; import com.android.settings.applications.assist.ManageAssist; import com.android.settings.backup.BackupSettingsActivity; import com.android.settings.backup.BackupSettingsFragment; +import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment; +import com.android.settings.connecteddevice.BluetoothDashboardFragment; import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment; +import com.android.settings.connecteddevice.PreviouslyConnectedDeviceDashboardFragment; import com.android.settings.connecteddevice.usb.UsbDetailsFragment; import com.android.settings.datausage.DataUsageSummary; +import com.android.settings.datausage.DataUsageSummaryLegacy; import com.android.settings.deletionhelper.AutomaticStorageManagerSettings; import com.android.settings.development.DevelopmentSettingsDashboardFragment; import com.android.settings.deviceinfo.DeviceInfoSettings; import com.android.settings.deviceinfo.StorageDashboardFragment; import com.android.settings.deviceinfo.StorageSettings; +import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment; import com.android.settings.display.AmbientDisplaySettings; import com.android.settings.display.AutoBrightnessSettings; import com.android.settings.display.NightDisplaySettings; @@ -52,17 +52,17 @@ import com.android.settings.display.ScreenZoomSettings; import com.android.settings.dream.DreamSettings; import com.android.settings.enterprise.EnterprisePrivacySettings; import com.android.settings.fuelgauge.PowerUsageAdvanced; -import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings; import com.android.settings.fuelgauge.PowerUsageSummary; import com.android.settings.fuelgauge.SmartBatterySettings; +import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings; import com.android.settings.gestures.AssistGestureSettings; import com.android.settings.gestures.DoubleTapPowerSettings; import com.android.settings.gestures.DoubleTapScreenSettings; import com.android.settings.gestures.DoubleTwistGestureSettings; -import com.android.settings.gestures.SwipeUpGestureSettings; import com.android.settings.gestures.GestureSettings; import com.android.settings.gestures.PickupGestureSettings; import com.android.settings.gestures.SwipeToNotificationSettings; +import com.android.settings.gestures.SwipeUpGestureSettings; import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment; import com.android.settings.inputmethod.PhysicalKeyboardFragment; import com.android.settings.inputmethod.VirtualKeyboardFragment; @@ -75,9 +75,9 @@ import com.android.settings.nfc.PaymentSettings; import com.android.settings.notification.ConfigureNotificationSettings; import com.android.settings.notification.SoundSettings; import com.android.settings.notification.ZenModeAutomationSettings; +import com.android.settings.notification.ZenModeBlockedEffectsSettings; import com.android.settings.notification.ZenModeCallsSettings; import com.android.settings.notification.ZenModeMsgEventReminderSettings; -import com.android.settings.notification.ZenModeBlockedEffectsSettings; import com.android.settings.notification.ZenModeRestrictNotificationsSettings; import com.android.settings.notification.ZenModeSettings; import com.android.settings.notification.ZenModeSoundVibrationSettings; diff --git a/src/com/android/settings/search/indexing/IndexDataConverter.java b/src/com/android/settings/search/indexing/IndexDataConverter.java index 8aa84fa515e..4192777bd6a 100644 --- a/src/com/android/settings/search/indexing/IndexDataConverter.java +++ b/src/com/android/settings/search/indexing/IndexDataConverter.java @@ -23,14 +23,15 @@ import android.content.res.Resources; import android.content.res.XmlResourceParser; import android.provider.SearchIndexableData; import android.provider.SearchIndexableResource; -import androidx.annotation.DrawableRes; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; import android.util.Xml; -import com.android.settings.search.DatabaseIndexingUtils; +import androidx.annotation.DrawableRes; + import com.android.settings.core.PreferenceXmlParserUtils; +import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.ResultPayload; import com.android.settings.search.SearchIndexableRaw; diff --git a/src/com/android/settings/search/indexing/PreIndexDataCollector.java b/src/com/android/settings/search/indexing/PreIndexDataCollector.java index 63000b48744..93dc7e23255 100644 --- a/src/com/android/settings/search/indexing/PreIndexDataCollector.java +++ b/src/com/android/settings/search/indexing/PreIndexDataCollector.java @@ -17,6 +17,28 @@ package com.android.settings.search.indexing; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_CLASS_NAME; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_ENTRIES; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_ICON_RESID; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_ACTION; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_CLASS; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_PACKAGE; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_KEY; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_KEYWORDS; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_RANK; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SCREEN_TITLE; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SUMMARY_OFF; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SUMMARY_ON; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_TITLE; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_USER_ID; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_CLASS_NAME; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_ICON_RESID; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_ACTION; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_TARGET_CLASS; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_TARGET_PACKAGE; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RESID; + import android.Manifest; import android.content.ContentResolver; import android.content.Context; @@ -40,29 +62,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_CLASS_NAME; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_ICON_RESID; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RESID; - -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_CLASS_NAME; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_ENTRIES; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_ICON_RESID; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_ACTION; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_CLASS; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_PACKAGE; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_KEY; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_KEYWORDS; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_RANK; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SCREEN_TITLE; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SUMMARY_OFF; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SUMMARY_ON; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_TITLE; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_USER_ID; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_ACTION; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_TARGET_CLASS; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_TARGET_PACKAGE; - /** * Collects all data from {@link android.provider.SearchIndexablesProvider} to be indexed. */ diff --git a/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java b/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java index c244e47b562..ca08cacd738 100644 --- a/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java +++ b/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java @@ -21,9 +21,10 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.SubSettingLauncher; diff --git a/src/com/android/settings/security/ChangeScreenLockPreferenceController.java b/src/com/android/settings/security/ChangeScreenLockPreferenceController.java index 5188d1ce918..be9845d9ebe 100644 --- a/src/com/android/settings/security/ChangeScreenLockPreferenceController.java +++ b/src/com/android/settings/security/ChangeScreenLockPreferenceController.java @@ -21,9 +21,10 @@ import android.content.Context; import android.os.UserHandle; import android.os.UserManager; import android.os.storage.StorageManager; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; diff --git a/src/com/android/settings/security/ConfigureKeyGuardDialog.java b/src/com/android/settings/security/ConfigureKeyGuardDialog.java index f5d9068729a..9835ea22896 100644 --- a/src/com/android/settings/security/ConfigureKeyGuardDialog.java +++ b/src/com/android/settings/security/ConfigureKeyGuardDialog.java @@ -23,6 +23,7 @@ import android.app.admin.DevicePolicyManager; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/security/CredentialStoragePreferenceController.java b/src/com/android/settings/security/CredentialStoragePreferenceController.java index 3bf61f63c1a..060d9642e1c 100644 --- a/src/com/android/settings/security/CredentialStoragePreferenceController.java +++ b/src/com/android/settings/security/CredentialStoragePreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.security; import android.content.Context; import android.os.UserManager; import android.security.KeyStore; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/security/CryptKeeperSettings.java b/src/com/android/settings/security/CryptKeeperSettings.java index 72ae0a79743..4101fadb196 100644 --- a/src/com/android/settings/security/CryptKeeperSettings.java +++ b/src/com/android/settings/security/CryptKeeperSettings.java @@ -28,13 +28,14 @@ import android.os.BatteryManager; import android.os.Bundle; import android.os.UserHandle; import android.os.storage.StorageManager; -import androidx.preference.Preference; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.CryptKeeperConfirm; import com.android.settings.R; diff --git a/src/com/android/settings/security/EncryptionStatusPreferenceController.java b/src/com/android/settings/security/EncryptionStatusPreferenceController.java index 27e896aff39..ea38068648c 100644 --- a/src/com/android/settings/security/EncryptionStatusPreferenceController.java +++ b/src/com/android/settings/security/EncryptionStatusPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.security; import android.content.Context; import android.os.UserManager; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/security/LockUnificationPreferenceController.java b/src/com/android/settings/security/LockUnificationPreferenceController.java index ca6dc2d4ff4..d0a4287a406 100644 --- a/src/com/android/settings/security/LockUnificationPreferenceController.java +++ b/src/com/android/settings/security/LockUnificationPreferenceController.java @@ -27,6 +27,7 @@ import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/security/LockdownButtonPreferenceController.java b/src/com/android/settings/security/LockdownButtonPreferenceController.java index d0a49d7bf6a..8c3d19a2f62 100644 --- a/src/com/android/settings/security/LockdownButtonPreferenceController.java +++ b/src/com/android/settings/security/LockdownButtonPreferenceController.java @@ -19,8 +19,6 @@ package com.android.settings.security; import android.content.Context; import android.os.UserHandle; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.TwoStatePreference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java index c928b8ecce7..ae5dd96f09a 100644 --- a/src/com/android/settings/security/LockscreenDashboardFragment.java +++ b/src/com/android/settings/security/LockscreenDashboardFragment.java @@ -18,6 +18,7 @@ package com.android.settings.security; import android.content.Context; import android.provider.SearchIndexableResource; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/security/OwnerInfoPreferenceController.java b/src/com/android/settings/security/OwnerInfoPreferenceController.java index 01a02900e52..012d0b66ff0 100644 --- a/src/com/android/settings/security/OwnerInfoPreferenceController.java +++ b/src/com/android/settings/security/OwnerInfoPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.security; import android.app.Fragment; import android.content.Context; import android.os.UserHandle; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; diff --git a/src/com/android/settings/security/ResetCredentialsPreferenceController.java b/src/com/android/settings/security/ResetCredentialsPreferenceController.java index d77fa628604..ee09bcad0e9 100644 --- a/src/com/android/settings/security/ResetCredentialsPreferenceController.java +++ b/src/com/android/settings/security/ResetCredentialsPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.security; import android.content.Context; import android.os.UserManager; import android.security.KeyStore; + import androidx.preference.PreferenceScreen; import com.android.settingslib.RestrictedPreference; diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java index 4806b8e8aaa..00892c19f69 100644 --- a/src/com/android/settings/security/ScreenPinningSettings.java +++ b/src/com/android/settings/security/ScreenPinningSettings.java @@ -22,15 +22,16 @@ import android.os.Bundle; import android.os.UserHandle; import android.provider.SearchIndexableResource; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceScreen; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Switch; +import androidx.preference.Preference; +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; diff --git a/src/com/android/settings/security/ShowPasswordPreferenceController.java b/src/com/android/settings/security/ShowPasswordPreferenceController.java index 8672974fd2d..472101bfc55 100644 --- a/src/com/android/settings/security/ShowPasswordPreferenceController.java +++ b/src/com/android/settings/security/ShowPasswordPreferenceController.java @@ -21,9 +21,9 @@ import android.os.UserHandle; import android.provider.Settings; import com.android.internal.widget.LockPatternUtils; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.overlay.FeatureFactory; -import com.android.settings.R; public class ShowPasswordPreferenceController extends TogglePreferenceController { diff --git a/src/com/android/settings/security/SimLockPreferenceController.java b/src/com/android/settings/security/SimLockPreferenceController.java index 683b99a3bfb..d8d6252e7a3 100644 --- a/src/com/android/settings/security/SimLockPreferenceController.java +++ b/src/com/android/settings/security/SimLockPreferenceController.java @@ -19,13 +19,14 @@ package com.android.settings.security; import android.content.Context; import android.os.PersistableBundle; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import java.util.List; diff --git a/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java b/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java index 1c71975bf8d..00167672441 100644 --- a/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java +++ b/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java @@ -21,9 +21,10 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING; import android.content.Context; import android.os.UserHandle; import android.os.UserManager; +import android.util.Log; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Log; import com.android.internal.widget.LockPatternUtils; import com.android.settings.Utils; diff --git a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java index c2bd38bcef5..6aa3ccb4d46 100644 --- a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java +++ b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java @@ -22,10 +22,11 @@ import android.app.admin.DevicePolicyManager; import android.content.Context; import android.os.UserHandle; import android.provider.Settings; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.TimeoutListPreference; diff --git a/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java b/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java index 1624f12cbb8..38c6f2426d3 100644 --- a/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java +++ b/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java @@ -20,6 +20,7 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED import android.content.Context; import android.os.UserHandle; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java b/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java index 5f436803c84..133078c9eec 100644 --- a/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java +++ b/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.security.screenlock; import android.app.admin.DevicePolicyManager; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.TwoStatePreference; diff --git a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java index 6421bd9fe9e..ffd01830dae 100644 --- a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java +++ b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.security.screenlock; import android.app.admin.DevicePolicyManager; import android.content.Context; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.TwoStatePreference; -import android.text.TextUtils; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; diff --git a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java b/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java index 3d92bdea47d..056c1f293c2 100644 --- a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java +++ b/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.security.trustagent; import android.content.Context; import android.os.UserHandle; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java index 89d8de7b044..6f5d7eb955a 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java +++ b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java @@ -23,11 +23,12 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; diff --git a/src/com/android/settings/security/trustagent/TrustAgentManager.java b/src/com/android/settings/security/trustagent/TrustAgentManager.java index 7dcb832b9b4..feac9fa76b2 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentManager.java +++ b/src/com/android/settings/security/trustagent/TrustAgentManager.java @@ -29,13 +29,14 @@ import android.content.res.TypedArray; import android.content.res.XmlResourceParser; import android.os.UserHandle; import android.service.trust.TrustAgentService; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; import android.util.Slog; import android.util.Xml; +import androidx.annotation.VisibleForTesting; + import com.android.internal.widget.LockPatternUtils; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/security/trustagent/TrustAgentSettings.java b/src/com/android/settings/security/trustagent/TrustAgentSettings.java index 02d354a78fd..c7988981155 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentSettings.java +++ b/src/com/android/settings/security/trustagent/TrustAgentSettings.java @@ -28,12 +28,13 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; import android.service.trust.TrustAgentService; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; import android.util.ArrayMap; import android.util.ArraySet; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; diff --git a/src/com/android/settings/shortcut/CreateShortcut.java b/src/com/android/settings/shortcut/CreateShortcut.java index 78969fed3e2..9fce3bafd0d 100644 --- a/src/com/android/settings/shortcut/CreateShortcut.java +++ b/src/com/android/settings/shortcut/CreateShortcut.java @@ -33,7 +33,6 @@ import android.graphics.drawable.Icon; import android.graphics.drawable.LayerDrawable; import android.net.ConnectivityManager; import android.os.AsyncTask; -import androidx.annotation.VisibleForTesting; import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; @@ -41,6 +40,8 @@ import android.view.View.MeasureSpec; import android.widget.ImageView; import android.widget.ListView; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Settings.TetherSettingsActivity; diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java index ebf34e5ca7c..6806f9f0857 100644 --- a/src/com/android/settings/sim/SimSelectNotification.java +++ b/src/com/android/settings/sim/SimSelectNotification.java @@ -23,13 +23,13 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.res.Resources; -import android.provider.Settings; -import androidx.core.app.NotificationCompat; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.util.Log; +import androidx.core.app.NotificationCompat; + import com.android.internal.telephony.IccCardConstants; import com.android.settings.R; import com.android.settings.Settings.SimSettingsActivity; diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index b0cf194e04d..e3858f4b28f 100644 --- a/src/com/android/settings/sim/SimSettings.java +++ b/src/com/android/settings/sim/SimSettings.java @@ -23,8 +23,6 @@ import android.graphics.drawable.BitmapDrawable; import android.os.Bundle; import android.os.SystemProperties; import android.provider.SearchIndexableResource; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telecom.PhoneAccountHandle; import android.telecom.TelecomManager; import android.telephony.PhoneNumberUtils; @@ -35,6 +33,9 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; 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; diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java index 4b9a7eced95..2b670a78ec3 100644 --- a/src/com/android/settings/slices/SettingsSliceProvider.java +++ b/src/com/android/settings/slices/SettingsSliceProvider.java @@ -26,13 +26,16 @@ import android.net.Uri; import android.os.StrictMode; import android.provider.Settings; import android.provider.SettingsSlicesContract; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.ArraySet; import android.util.KeyValueListParser; import android.util.Log; import android.util.Pair; +import androidx.annotation.VisibleForTesting; +import androidx.slice.Slice; +import androidx.slice.SliceProvider; + import com.android.settings.bluetooth.BluetoothSliceBuilder; import com.android.settings.core.BasePreferenceController; import com.android.settings.location.LocationSliceBuilder; @@ -54,9 +57,6 @@ import java.util.Set; import java.util.WeakHashMap; import java.util.concurrent.ConcurrentHashMap; -import androidx.slice.Slice; -import androidx.slice.SliceProvider; - /** * A {@link SliceProvider} for Settings to enabled inline results in system apps. * diff --git a/src/com/android/settings/slices/SliceBroadcastReceiver.java b/src/com/android/settings/slices/SliceBroadcastReceiver.java index d81734a974d..7065c5dc200 100644 --- a/src/com/android/settings/slices/SliceBroadcastReceiver.java +++ b/src/com/android/settings/slices/SliceBroadcastReceiver.java @@ -22,8 +22,8 @@ import static com.android.settings.slices.SettingsSliceProvider.ACTION_SLIDER_CH import static com.android.settings.slices.SettingsSliceProvider.ACTION_TOGGLE_CHANGED; import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_KEY; import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_PLATFORM_DEFINED; -import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_CHANGED; import static com.android.settings.wifi.WifiSliceBuilder.ACTION_WIFI_SLICE_CHANGED; +import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_CHANGED; import android.app.slice.Slice; import android.content.BroadcastReceiver; diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java index baac3b620fb..889579f06b6 100644 --- a/src/com/android/settings/slices/SliceBuilderUtils.java +++ b/src/com/android/settings/slices/SliceBuilderUtils.java @@ -16,11 +16,7 @@ package com.android.settings.slices; -import static com.android.settings.core.BasePreferenceController.AVAILABLE; -import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING; -import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; -import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_KEY; import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_PLATFORM_DEFINED; @@ -30,12 +26,16 @@ import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.provider.Settings; import android.provider.SettingsSlicesContract; import android.text.TextUtils; import android.util.Log; import android.util.Pair; +import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.builders.ListBuilder; +import androidx.slice.builders.SliceAction; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -46,20 +46,13 @@ import com.android.settings.core.SliderPreferenceController; import com.android.settings.core.TogglePreferenceController; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.DatabaseIndexingUtils; -import com.android.settingslib.SliceBroadcastRelay; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.core.graphics.drawable.IconCompat; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import androidx.slice.Slice; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.SliceAction; - /** * Utility class to build Slices objects and Preference Controllers based on the Database managed diff --git a/src/com/android/settings/slices/SliceData.java b/src/com/android/settings/slices/SliceData.java index 689108a0077..72729a842f7 100644 --- a/src/com/android/settings/slices/SliceData.java +++ b/src/com/android/settings/slices/SliceData.java @@ -22,7 +22,6 @@ import android.text.TextUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import java.util.List; /** * Data class representing a slice stored by {@link SlicesIndexer}. diff --git a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java index 4f8ed96b9a5..60a96aeaadd 100644 --- a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java +++ b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java @@ -24,9 +24,7 @@ import android.util.Log; import com.android.settings.bluetooth.BluetoothSliceBuilder; import com.android.settings.location.LocationSliceBuilder; import com.android.settings.notification.ZenModeSliceBuilder; -import com.android.settings.overlay.FeatureFactory; import com.android.settings.wifi.WifiSliceBuilder; -import com.android.settings.wifi.calling.WifiCallingSliceHelper; import java.net.URISyntaxException; diff --git a/src/com/android/settings/slices/SlicesDatabaseAccessor.java b/src/com/android/settings/slices/SlicesDatabaseAccessor.java index b14a716acab..79d3bc6f007 100644 --- a/src/com/android/settings/slices/SlicesDatabaseAccessor.java +++ b/src/com/android/settings/slices/SlicesDatabaseAccessor.java @@ -18,22 +18,21 @@ package com.android.settings.slices; import static com.android.settings.slices.SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX; +import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.net.Uri; - -import android.content.Context; import android.os.Binder; import android.util.Pair; +import androidx.slice.Slice; + import com.android.settings.overlay.FeatureFactory; import com.android.settings.slices.SlicesDatabaseHelper.IndexColumns; import java.util.ArrayList; import java.util.List; -import androidx.slice.Slice; - /** * Class used to map a {@link Uri} from {@link SettingsSliceProvider} to a Slice. */ diff --git a/src/com/android/settings/slices/SlicesDatabaseHelper.java b/src/com/android/settings/slices/SlicesDatabaseHelper.java index d4b71cfbbd2..f1628e766ce 100644 --- a/src/com/android/settings/slices/SlicesDatabaseHelper.java +++ b/src/com/android/settings/slices/SlicesDatabaseHelper.java @@ -17,13 +17,13 @@ package com.android.settings.slices; import android.content.Context; - import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.os.Build; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import java.util.Locale; /** diff --git a/src/com/android/settings/slices/SlicesIndexer.java b/src/com/android/settings/slices/SlicesIndexer.java index 704d8d6b074..f88af8fe8f4 100644 --- a/src/com/android/settings/slices/SlicesIndexer.java +++ b/src/com/android/settings/slices/SlicesIndexer.java @@ -19,12 +19,12 @@ package com.android.settings.slices; import android.content.ContentValues; import android.content.Context; import android.database.sqlite.SQLiteDatabase; -import androidx.annotation.VisibleForTesting; import android.util.Log; -import com.android.settings.dashboard.DashboardFragment; +import androidx.annotation.VisibleForTesting; import com.android.settings.core.BasePreferenceController; +import com.android.settings.dashboard.DashboardFragment; import com.android.settings.overlay.FeatureFactory; import com.android.settings.slices.SlicesDatabaseHelper.IndexColumns; import com.android.settings.slices.SlicesDatabaseHelper.Tables; diff --git a/src/com/android/settings/sound/AudioSwitchPreferenceController.java b/src/com/android/settings/sound/AudioSwitchPreferenceController.java index 119fadbd4ba..ded8604a58e 100644 --- a/src/com/android/settings/sound/AudioSwitchPreferenceController.java +++ b/src/com/android/settings/sound/AudioSwitchPreferenceController.java @@ -37,13 +37,14 @@ import android.media.MediaRouter; import android.media.MediaRouter.Callback; import android.os.Handler; import android.os.Looper; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.FeatureFlagUtils; import android.util.Log; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.bluetooth.Utils; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java index fdbf610802c..b18130a6863 100644 --- a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java +++ b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java @@ -20,13 +20,13 @@ import static android.bluetooth.IBluetoothHearingAid.HI_SYNC_ID_INVALID; import static android.media.AudioManager.STREAM_VOICE_CALL; import static android.media.AudioSystem.DEVICE_OUT_USB_HEADSET; -import com.android.settingslib.Utils; - import android.bluetooth.BluetoothDevice; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; +import com.android.settingslib.Utils; import com.android.settingslib.bluetooth.HeadsetProfile; import com.android.settingslib.bluetooth.HearingAidProfile; diff --git a/src/com/android/settings/sound/MediaOutputPreferenceController.java b/src/com/android/settings/sound/MediaOutputPreferenceController.java index bf9e37f9039..8989de3c65b 100644 --- a/src/com/android/settings/sound/MediaOutputPreferenceController.java +++ b/src/com/android/settings/sound/MediaOutputPreferenceController.java @@ -21,14 +21,14 @@ import static android.media.AudioManager.STREAM_MUSIC; import static android.media.AudioSystem.DEVICE_OUT_REMOTE_SUBMIX; import static android.media.AudioSystem.DEVICE_OUT_USB_HEADSET; -import com.android.settingslib.Utils; - import android.bluetooth.BluetoothDevice; import android.content.Context; import android.media.AudioManager; + import androidx.preference.Preference; import com.android.settings.R; +import com.android.settingslib.Utils; import com.android.settingslib.bluetooth.A2dpProfile; import com.android.settingslib.bluetooth.HearingAidProfile; diff --git a/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java b/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java index 1ec566e01bf..4cf657288f8 100644 --- a/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java +++ b/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java @@ -25,12 +25,13 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.Log; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/survey/SurveyMixin.java b/src/com/android/settings/survey/SurveyMixin.java index 9b7a9df0c73..552ed92953b 100644 --- a/src/com/android/settings/survey/SurveyMixin.java +++ b/src/com/android/settings/survey/SurveyMixin.java @@ -18,6 +18,7 @@ package com.android.settings.survey; import android.app.Activity; import android.app.Fragment; import android.content.BroadcastReceiver; + import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.SurveyFeatureProvider; import com.android.settingslib.core.lifecycle.LifecycleObserver; diff --git a/src/com/android/settings/system/SystemDashboardFragment.java b/src/com/android/settings/system/SystemDashboardFragment.java index 62be5ffd0db..a493bcd75ee 100644 --- a/src/com/android/settings/system/SystemDashboardFragment.java +++ b/src/com/android/settings/system/SystemDashboardFragment.java @@ -18,6 +18,7 @@ package com.android.settings.system; import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; + import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/system/SystemUpdatePreferenceController.java b/src/com/android/settings/system/SystemUpdatePreferenceController.java index 54ab924a578..dd044092c4b 100644 --- a/src/com/android/settings/system/SystemUpdatePreferenceController.java +++ b/src/com/android/settings/system/SystemUpdatePreferenceController.java @@ -25,12 +25,13 @@ import android.os.Bundle; import android.os.PersistableBundle; import android.os.SystemUpdateManager; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.CarrierConfigManager; import android.text.TextUtils; import android.util.Log; +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/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java index 95ac8f50fc8..d0a086e20d3 100644 --- a/src/com/android/settings/tts/TextToSpeechSettings.java +++ b/src/com/android/settings/tts/TextToSpeechSettings.java @@ -31,12 +31,13 @@ import android.speech.tts.TextToSpeech; import android.speech.tts.TextToSpeech.EngineInfo; import android.speech.tts.TtsEngines; import android.speech.tts.UtteranceProgressListener; -import androidx.preference.ListPreference; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; import android.util.Pair; +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; diff --git a/src/com/android/settings/tts/TtsEnginePreference.java b/src/com/android/settings/tts/TtsEnginePreference.java index a5cb1fd3655..e073b718416 100644 --- a/src/com/android/settings/tts/TtsEnginePreference.java +++ b/src/com/android/settings/tts/TtsEnginePreference.java @@ -21,13 +21,14 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.speech.tts.TextToSpeech.EngineInfo; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.util.Log; import android.widget.Checkable; import android.widget.CompoundButton; import android.widget.RadioButton; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java index 2b35a596928..9a78876053a 100644 --- a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java +++ b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java @@ -1,25 +1,28 @@ package com.android.settings.tts; -import android.speech.tts.TextToSpeech; -import com.android.settings.R; +import static android.provider.Settings.Secure.TTS_DEFAULT_SYNTH; + +import android.content.Context; import android.os.Bundle; -import com.android.settings.SettingsPreferenceFragment; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import androidx.preference.PreferenceCategory; -import android.speech.tts.TtsEngines; +import android.provider.SearchIndexableResource; +import android.speech.tts.TextToSpeech; import android.speech.tts.TextToSpeech.EngineInfo; -import com.android.settings.SettingsActivity; -import com.android.settings.tts.TtsEnginePreference.RadioButtonGroupState; -import android.widget.Checkable; +import android.speech.tts.TtsEngines; import android.util.Log; -import static android.provider.Settings.Secure.TTS_DEFAULT_SYNTH; -import com.android.settings.search.Indexable; +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; import com.android.settings.search.BaseSearchIndexProvider; -import android.content.Context; -import android.provider.SearchIndexableResource; +import com.android.settings.search.Indexable; +import com.android.settings.tts.TtsEnginePreference.RadioButtonGroupState; -import java.util.List; import java.util.Arrays; +import java.util.List; public class TtsEnginePreferenceFragment extends SettingsPreferenceFragment //implements implements RadioButtonGroupState, Indexable { diff --git a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java index bebc2d73b06..24773e7a9b5 100644 --- a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java +++ b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.users; import android.content.Context; import android.provider.Settings.Global; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java index db132426711..a4e0cff5c3a 100644 --- a/src/com/android/settings/users/AppRestrictionsFragment.java +++ b/src/com/android/settings/users/AppRestrictionsFragment.java @@ -36,14 +36,6 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.MultiSelectListPreference; -import androidx.preference.SwitchPreference; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceViewHolder; import android.util.Log; import android.view.View; import android.view.View.OnClickListener; @@ -52,6 +44,15 @@ import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.Switch; +import androidx.preference.ListPreference; +import androidx.preference.MultiSelectListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference.OnPreferenceClickListener; +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; diff --git a/src/com/android/settings/users/AutoSyncDataPreferenceController.java b/src/com/android/settings/users/AutoSyncDataPreferenceController.java index 42de8921463..f73c6debd15 100644 --- a/src/com/android/settings/users/AutoSyncDataPreferenceController.java +++ b/src/com/android/settings/users/AutoSyncDataPreferenceController.java @@ -26,10 +26,11 @@ import android.os.Bundle; import android.os.Process; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.util.Log; +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; diff --git a/src/com/android/settings/users/EditUserPhotoController.java b/src/com/android/settings/users/EditUserPhotoController.java index 9368b81353a..a13c7702dc7 100644 --- a/src/com/android/settings/users/EditUserPhotoController.java +++ b/src/com/android/settings/users/EditUserPhotoController.java @@ -38,7 +38,6 @@ import android.os.UserHandle; import android.os.UserManager; import android.provider.ContactsContract.DisplayPhoto; import android.provider.MediaStore; -import androidx.core.content.FileProvider; import android.util.Log; import android.view.Gravity; import android.view.View; @@ -50,6 +49,8 @@ import android.widget.ImageView; import android.widget.ListPopupWindow; import android.widget.TextView; +import androidx.core.content.FileProvider; + import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.drawable.CircleFramedDrawable; diff --git a/src/com/android/settings/users/RestrictionUtils.java b/src/com/android/settings/users/RestrictionUtils.java index a5cecde4b60..4d4a2dd5ae0 100644 --- a/src/com/android/settings/users/RestrictionUtils.java +++ b/src/com/android/settings/users/RestrictionUtils.java @@ -22,7 +22,6 @@ import android.content.res.Resources; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import android.provider.Settings.Secure; import com.android.settings.R; diff --git a/src/com/android/settings/users/UserCapabilities.java b/src/com/android/settings/users/UserCapabilities.java index f1bfae90c97..aca3e493a3d 100644 --- a/src/com/android/settings/users/UserCapabilities.java +++ b/src/com/android/settings/users/UserCapabilities.java @@ -22,6 +22,7 @@ import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; + import com.android.settings.Utils; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java index d18e2ea5bf3..65868e9653a 100644 --- a/src/com/android/settings/users/UserDetailsSettings.java +++ b/src/com/android/settings/users/UserDetailsSettings.java @@ -23,8 +23,9 @@ import android.content.pm.UserInfo; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/users/UserPreference.java b/src/com/android/settings/users/UserPreference.java index 391e13a7065..bcc01675077 100644 --- a/src/com/android/settings/users/UserPreference.java +++ b/src/com/android/settings/users/UserPreference.java @@ -20,12 +20,13 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.view.View.OnClickListener; import android.widget.ImageView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreference; diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index 5e88895d3ee..56a921c982c 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -43,12 +43,6 @@ import android.os.UserManager; import android.provider.ContactsContract; import android.provider.SearchIndexableResource; import android.provider.Settings.Global; -import androidx.annotation.VisibleForTesting; -import androidx.annotation.WorkerThread; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; import android.util.Log; import android.util.SparseArray; import android.view.Menu; @@ -58,6 +52,13 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.SimpleAdapter; +import androidx.annotation.VisibleForTesting; +import androidx.annotation.WorkerThread; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +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; diff --git a/src/com/android/settings/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java index 71f52f83536..6a05e91bef2 100644 --- a/src/com/android/settings/utils/ManagedServiceSettings.java +++ b/src/com/android/settings/utils/ManagedServiceSettings.java @@ -30,12 +30,13 @@ import android.content.pm.ServiceInfo; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import android.util.IconDrawableFactory; import android.util.Log; import android.view.View; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/utils/SettingsDividerItemDecoration.java b/src/com/android/settings/utils/SettingsDividerItemDecoration.java index 32844d5ee71..85cd9617b98 100644 --- a/src/com/android/settings/utils/SettingsDividerItemDecoration.java +++ b/src/com/android/settings/utils/SettingsDividerItemDecoration.java @@ -17,6 +17,7 @@ package com.android.settings.utils; import android.content.Context; + import androidx.preference.PreferenceViewHolder; import androidx.recyclerview.widget.RecyclerView; diff --git a/src/com/android/settings/utils/ZenServiceListing.java b/src/com/android/settings/utils/ZenServiceListing.java index 40a4f34dfae..e87cc51f2c2 100644 --- a/src/com/android/settings/utils/ZenServiceListing.java +++ b/src/com/android/settings/utils/ZenServiceListing.java @@ -18,19 +18,15 @@ package com.android.settings.utils; import android.app.ActivityManager; import android.app.NotificationManager; import android.content.ComponentName; -import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; -import android.provider.Settings; -import android.text.TextUtils; import android.util.ArraySet; import android.util.Slog; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Set; diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java index 1d77caf9b62..365fd9a5dfa 100644 --- a/src/com/android/settings/vpn2/AppManagementFragment.java +++ b/src/com/android/settings/vpn2/AppManagementFragment.java @@ -34,10 +34,11 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.net.VpnConfig; diff --git a/src/com/android/settings/vpn2/AppPreference.java b/src/com/android/settings/vpn2/AppPreference.java index fc06b1e1129..6b64250df32 100644 --- a/src/com/android/settings/vpn2/AppPreference.java +++ b/src/com/android/settings/vpn2/AppPreference.java @@ -21,6 +21,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.os.UserHandle; + import androidx.preference.Preference; import com.android.internal.net.LegacyVpnInfo; diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java index 5aa10b94d1f..00b22bb2fb3 100644 --- a/src/com/android/settings/vpn2/ConfigDialogFragment.java +++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java @@ -18,7 +18,6 @@ package com.android.settings.vpn2; import android.app.AlertDialog; import android.app.Dialog; -import android.app.DialogFragment; import android.content.Context; import android.content.DialogInterface; import android.net.ConnectivityManager; @@ -35,7 +34,6 @@ import android.widget.Toast; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.net.LegacyVpnInfo; -import com.android.internal.net.VpnConfig; import com.android.internal.net.VpnProfile; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/vpn2/ConfirmLockdownFragment.java b/src/com/android/settings/vpn2/ConfirmLockdownFragment.java index 2e0914ed4e3..d4b26776eb4 100644 --- a/src/com/android/settings/vpn2/ConfirmLockdownFragment.java +++ b/src/com/android/settings/vpn2/ConfirmLockdownFragment.java @@ -15,10 +15,9 @@ */ package com.android.settings.vpn2; -import android.app.Fragment; import android.app.AlertDialog; import android.app.Dialog; -import android.app.DialogFragment; +import android.app.Fragment; import android.content.DialogInterface; import android.os.Bundle; diff --git a/src/com/android/settings/vpn2/LegacyVpnPreference.java b/src/com/android/settings/vpn2/LegacyVpnPreference.java index 1f06a958eae..e44a0570fa7 100644 --- a/src/com/android/settings/vpn2/LegacyVpnPreference.java +++ b/src/com/android/settings/vpn2/LegacyVpnPreference.java @@ -19,10 +19,11 @@ package com.android.settings.vpn2; import static com.android.internal.net.LegacyVpnInfo.STATE_CONNECTED; import android.content.Context; -import androidx.preference.Preference; import android.text.TextUtils; import android.view.View; +import androidx.preference.Preference; + import com.android.internal.net.VpnProfile; import com.android.settings.R; diff --git a/src/com/android/settings/vpn2/ManageablePreference.java b/src/com/android/settings/vpn2/ManageablePreference.java index 11da7585416..68971f2f2fb 100644 --- a/src/com/android/settings/vpn2/ManageablePreference.java +++ b/src/com/android/settings/vpn2/ManageablePreference.java @@ -23,8 +23,8 @@ import android.os.UserManager; import android.text.TextUtils; import android.util.AttributeSet; -import com.android.settings.widget.GearPreference; import com.android.settings.R; +import com.android.settings.widget.GearPreference; /** * This class sets appropriate enabled state and user admin message when userId is set diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java index f6444bf6437..6d87707ed4b 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -16,6 +16,8 @@ package com.android.settings.vpn2; +import static android.app.AppOpsManager.OP_ACTIVATE_VPN; + import android.annotation.UiThread; import android.annotation.WorkerThread; import android.app.Activity; @@ -40,8 +42,6 @@ import android.os.UserHandle; import android.os.UserManager; import android.security.Credentials; import android.security.KeyStore; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; @@ -49,6 +49,9 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -71,8 +74,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static android.app.AppOpsManager.OP_ACTIVATE_VPN; - /** * Settings screen listing VPNs. Configured VPNs and networks managed by apps * are shown in the same list. diff --git a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java index 80910a1ea59..5a12e1b76ab 100644 --- a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java +++ b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/wallpaper/WallpaperTypeSettings.java b/src/com/android/settings/wallpaper/WallpaperTypeSettings.java index 73a58fee068..ff3029e3697 100644 --- a/src/com/android/settings/wallpaper/WallpaperTypeSettings.java +++ b/src/com/android/settings/wallpaper/WallpaperTypeSettings.java @@ -22,6 +22,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/webview/WebViewAppPicker.java b/src/com/android/settings/webview/WebViewAppPicker.java index 6a8ab506813..e6b57a43f4f 100644 --- a/src/com/android/settings/webview/WebViewAppPicker.java +++ b/src/com/android/settings/webview/WebViewAppPicker.java @@ -25,10 +25,11 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageItemInfo; import android.content.pm.PackageManager; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; 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; diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java index 5ab0bcbe807..f102d64325a 100755 --- a/src/com/android/settings/wfd/WifiDisplaySettings.java +++ b/src/com/android/settings/wfd/WifiDisplaySettings.java @@ -39,14 +39,6 @@ import android.os.Handler; import android.os.Looper; import android.provider.SearchIndexableResource; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; -import androidx.preference.PreferenceViewHolder; import android.util.Slog; import android.util.TypedValue; import android.view.Menu; @@ -59,6 +51,15 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; +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; diff --git a/src/com/android/settings/widget/ActionBarShadowController.java b/src/com/android/settings/widget/ActionBarShadowController.java index cb5e38dcb62..1b8d3192a4a 100644 --- a/src/com/android/settings/widget/ActionBarShadowController.java +++ b/src/com/android/settings/widget/ActionBarShadowController.java @@ -18,9 +18,10 @@ package com.android.settings.widget; import android.app.ActionBar; import android.app.Activity; +import android.view.View; + import androidx.annotation.VisibleForTesting; import androidx.recyclerview.widget.RecyclerView; -import android.view.View; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; diff --git a/src/com/android/settings/widget/ActionButtonPreference.java b/src/com/android/settings/widget/ActionButtonPreference.java index 64a01c7e178..347a784b2ba 100644 --- a/src/com/android/settings/widget/ActionButtonPreference.java +++ b/src/com/android/settings/widget/ActionButtonPreference.java @@ -17,14 +17,15 @@ package com.android.settings.widget; import android.content.Context; -import androidx.annotation.StringRes; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; import android.widget.Button; +import androidx.annotation.StringRes; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; public class ActionButtonPreference extends Preference { diff --git a/src/com/android/settings/widget/AppCheckBoxPreference.java b/src/com/android/settings/widget/AppCheckBoxPreference.java index 23ee894b8d9..e779d403b08 100644 --- a/src/com/android/settings/widget/AppCheckBoxPreference.java +++ b/src/com/android/settings/widget/AppCheckBoxPreference.java @@ -17,9 +17,10 @@ package com.android.settings.widget; import android.content.Context; -import androidx.preference.CheckBoxPreference; import android.util.AttributeSet; +import androidx.preference.CheckBoxPreference; + import com.android.settings.R; /** diff --git a/src/com/android/settings/widget/AppPreference.java b/src/com/android/settings/widget/AppPreference.java index 3b716a31b90..91e700a0980 100644 --- a/src/com/android/settings/widget/AppPreference.java +++ b/src/com/android/settings/widget/AppPreference.java @@ -16,13 +16,14 @@ package com.android.settings.widget; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; import android.widget.ProgressBar; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; public class AppPreference extends Preference { diff --git a/src/com/android/settings/widget/AppSwitchPreference.java b/src/com/android/settings/widget/AppSwitchPreference.java index b42bb3db253..288096e7f80 100644 --- a/src/com/android/settings/widget/AppSwitchPreference.java +++ b/src/com/android/settings/widget/AppSwitchPreference.java @@ -17,11 +17,12 @@ package com.android.settings.widget; import android.content.Context; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.view.View; +import androidx.preference.PreferenceViewHolder; +import androidx.preference.SwitchPreference; + import com.android.settings.R; public class AppSwitchPreference extends SwitchPreference { diff --git a/src/com/android/settings/widget/AspectRatioFrameLayout.java b/src/com/android/settings/widget/AspectRatioFrameLayout.java index 5eab257ffaa..aa3d3c4ea1c 100644 --- a/src/com/android/settings/widget/AspectRatioFrameLayout.java +++ b/src/com/android/settings/widget/AspectRatioFrameLayout.java @@ -16,10 +16,11 @@ package com.android.settings.widget; import android.content.Context; import android.content.res.TypedArray; -import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.widget.FrameLayout; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; /** diff --git a/src/com/android/settings/widget/ChartDataUsageView.java b/src/com/android/settings/widget/ChartDataUsageView.java index 2d9fe6fdcd9..d1ddc14b40c 100644 --- a/src/com/android/settings/widget/ChartDataUsageView.java +++ b/src/com/android/settings/widget/ChartDataUsageView.java @@ -16,6 +16,8 @@ package com.android.settings.widget; +import static android.net.TrafficStats.MB_IN_BYTES; + import android.content.Context; import android.content.res.Resources; import android.net.NetworkPolicy; @@ -42,8 +44,6 @@ import java.util.Arrays; import java.util.Calendar; import java.util.Objects; -import static android.net.TrafficStats.MB_IN_BYTES; - /** * Specific {@link ChartView} that displays {@link ChartNetworkSeriesView} along * with {@link ChartSweepView} for inspection ranges and warning/limits. diff --git a/src/com/android/settings/widget/ChartGridView.java b/src/com/android/settings/widget/ChartGridView.java index b456a497338..de794823ceb 100644 --- a/src/com/android/settings/widget/ChartGridView.java +++ b/src/com/android/settings/widget/ChartGridView.java @@ -16,6 +16,8 @@ package com.android.settings.widget; +import static com.android.settings.Utils.formatDateRange; + import android.content.Context; import android.content.res.ColorStateList; import android.content.res.Resources; @@ -32,8 +34,6 @@ import android.view.View; import com.android.internal.util.Preconditions; import com.android.settings.R; -import static com.android.settings.Utils.formatDateRange; - /** * Background of {@link ChartView} that renders grid lines as requested by * {@link ChartAxis#getTickPoints()}. diff --git a/src/com/android/settings/widget/ChartNetworkSeriesView.java b/src/com/android/settings/widget/ChartNetworkSeriesView.java index 07c147924f6..7aaba6626a1 100644 --- a/src/com/android/settings/widget/ChartNetworkSeriesView.java +++ b/src/com/android/settings/widget/ChartNetworkSeriesView.java @@ -16,6 +16,9 @@ package com.android.settings.widget; +import static android.text.format.DateUtils.DAY_IN_MILLIS; +import static android.text.format.DateUtils.WEEK_IN_MILLIS; + import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; @@ -33,9 +36,6 @@ import android.view.View; import com.android.internal.util.Preconditions; import com.android.settings.R; -import static android.text.format.DateUtils.DAY_IN_MILLIS; -import static android.text.format.DateUtils.WEEK_IN_MILLIS; - /** * {@link NetworkStatsHistory} series to render inside a {@link ChartView}, * using {@link ChartAxis} to map into screen coordinates. diff --git a/src/com/android/settings/widget/DisabledCheckBoxPreference.java b/src/com/android/settings/widget/DisabledCheckBoxPreference.java index 3966864b1ee..be6deb3a0be 100644 --- a/src/com/android/settings/widget/DisabledCheckBoxPreference.java +++ b/src/com/android/settings/widget/DisabledCheckBoxPreference.java @@ -18,11 +18,12 @@ package com.android.settings.widget; import android.content.Context; import android.content.res.TypedArray; -import androidx.preference.CheckBoxPreference; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; +import androidx.preference.CheckBoxPreference; +import androidx.preference.PreferenceViewHolder; + /** * A CheckboxPreference that can disable its checkbox separate from its text. * Differs from CheckboxPreference.setDisabled() in that the text is not dimmed. diff --git a/src/com/android/settings/widget/DonutView.java b/src/com/android/settings/widget/DonutView.java index 32b994aefac..315d380f938 100644 --- a/src/com/android/settings/widget/DonutView.java +++ b/src/com/android/settings/widget/DonutView.java @@ -25,7 +25,6 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.graphics.Typeface; import android.icu.text.DecimalFormatSymbols; -import androidx.annotation.ColorRes; import android.text.Layout; import android.text.Spannable; import android.text.SpannableString; @@ -37,6 +36,8 @@ import android.text.style.RelativeSizeSpan; import android.util.AttributeSet; import android.view.View; +import androidx.annotation.ColorRes; + import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/widget/DotsPageIndicator.java b/src/com/android/settings/widget/DotsPageIndicator.java index 096338bbbf0..88e695105a1 100644 --- a/src/com/android/settings/widget/DotsPageIndicator.java +++ b/src/com/android/settings/widget/DotsPageIndicator.java @@ -30,10 +30,12 @@ import android.graphics.Paint; import android.graphics.Path; import android.graphics.RectF; import android.os.Build; -import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.View; import android.view.animation.Interpolator; + +import androidx.viewpager.widget.ViewPager; + import com.android.settings.R; import java.util.Arrays; diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java index 0f3a8b066fd..e2e803f4372 100644 --- a/src/com/android/settings/widget/EntityHeaderController.java +++ b/src/com/android/settings/widget/EntityHeaderController.java @@ -31,9 +31,6 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; -import androidx.annotation.IntDef; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.IconDrawableFactory; import android.util.Log; @@ -43,6 +40,10 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.IntDef; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.applications.AppInfoBase; diff --git a/src/com/android/settings/widget/FixedLineSummaryPreference.java b/src/com/android/settings/widget/FixedLineSummaryPreference.java index 7187c7b6ee5..534ab08a699 100644 --- a/src/com/android/settings/widget/FixedLineSummaryPreference.java +++ b/src/com/android/settings/widget/FixedLineSummaryPreference.java @@ -16,11 +16,13 @@ package com.android.settings.widget; import android.content.Context; import android.content.res.TypedArray; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils.TruncateAt; import android.util.AttributeSet; import android.widget.TextView; + +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; /** diff --git a/src/com/android/settings/widget/GearPreference.java b/src/com/android/settings/widget/GearPreference.java index 200156b1cdb..0a301006698 100644 --- a/src/com/android/settings/widget/GearPreference.java +++ b/src/com/android/settings/widget/GearPreference.java @@ -17,10 +17,11 @@ package com.android.settings.widget; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.RestrictedPreference; diff --git a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java index 3a5548ea7a3..313a204e5b6 100644 --- a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java +++ b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java @@ -25,16 +25,17 @@ import android.animation.ValueAnimator; import android.content.Context; import android.graphics.Color; import android.os.Bundle; +import android.text.TextUtils; +import android.util.Log; +import android.util.TypedValue; +import android.view.View; + import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceGroupAdapter; import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceViewHolder; import androidx.recyclerview.widget.RecyclerView; -import android.text.TextUtils; -import android.util.Log; -import android.util.TypedValue; -import android.view.View; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/widget/HotspotApBandSelectionPreference.java b/src/com/android/settings/widget/HotspotApBandSelectionPreference.java index b249b993856..3d75b94f9ce 100644 --- a/src/com/android/settings/widget/HotspotApBandSelectionPreference.java +++ b/src/com/android/settings/widget/HotspotApBandSelectionPreference.java @@ -19,10 +19,8 @@ import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.net.wifi.WifiConfiguration; -import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.view.View; import android.widget.Button; @@ -30,6 +28,8 @@ import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.LinearLayout; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settingslib.CustomDialogPreference; diff --git a/src/com/android/settings/widget/LabeledSeekBar.java b/src/com/android/settings/widget/LabeledSeekBar.java index 7725283e0c4..14c3d7db012 100644 --- a/src/com/android/settings/widget/LabeledSeekBar.java +++ b/src/com/android/settings/widget/LabeledSeekBar.java @@ -17,12 +17,8 @@ package com.android.settings.widget; import android.content.Context; -import android.content.res.Configuration; import android.graphics.Rect; import android.os.Bundle; -import androidx.core.view.ViewCompat; -import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; -import androidx.customview.widget.ExploreByTouchHelper; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; @@ -31,6 +27,10 @@ import android.widget.RadioButton; import android.widget.RadioGroup; import android.widget.SeekBar; +import androidx.core.view.ViewCompat; +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import androidx.customview.widget.ExploreByTouchHelper; + import java.util.List; /** diff --git a/src/com/android/settings/widget/MasterCheckBoxPreference.java b/src/com/android/settings/widget/MasterCheckBoxPreference.java index 8fe59e8b9a9..48e09c9a6cc 100644 --- a/src/com/android/settings/widget/MasterCheckBoxPreference.java +++ b/src/com/android/settings/widget/MasterCheckBoxPreference.java @@ -17,12 +17,13 @@ package com.android.settings.widget; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.view.View.OnClickListener; import android.widget.CheckBox; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.TwoTargetPreference; diff --git a/src/com/android/settings/widget/MasterSwitchController.java b/src/com/android/settings/widget/MasterSwitchController.java index 1244d336515..91595848bdc 100644 --- a/src/com/android/settings/widget/MasterSwitchController.java +++ b/src/com/android/settings/widget/MasterSwitchController.java @@ -17,7 +17,7 @@ package com.android.settings.widget; import androidx.preference.Preference; -import android.widget.Switch; + import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; /* diff --git a/src/com/android/settings/widget/MasterSwitchPreference.java b/src/com/android/settings/widget/MasterSwitchPreference.java index 765eae1293a..42529cfd4d0 100644 --- a/src/com/android/settings/widget/MasterSwitchPreference.java +++ b/src/com/android/settings/widget/MasterSwitchPreference.java @@ -17,12 +17,13 @@ package com.android.settings.widget; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.view.View.OnClickListener; import android.widget.Switch; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.TwoTargetPreference; diff --git a/src/com/android/settings/widget/RadioButtonPickerFragment.java b/src/com/android/settings/widget/RadioButtonPickerFragment.java index 8142d0bc716..89df487200e 100644 --- a/src/com/android/settings/widget/RadioButtonPickerFragment.java +++ b/src/com/android/settings/widget/RadioButtonPickerFragment.java @@ -20,16 +20,17 @@ import android.content.Context; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.LayoutRes; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.ArrayMap; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.LayoutRes; +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.InstrumentedPreferenceFragment; diff --git a/src/com/android/settings/widget/RadioButtonPreference.java b/src/com/android/settings/widget/RadioButtonPreference.java index 9b5c1700708..ed7f9053121 100644 --- a/src/com/android/settings/widget/RadioButtonPreference.java +++ b/src/com/android/settings/widget/RadioButtonPreference.java @@ -17,14 +17,15 @@ package com.android.settings.widget; import android.content.Context; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.CheckBoxPreference; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; import android.widget.TextView; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.CheckBoxPreference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; /** diff --git a/src/com/android/settings/widget/RestrictedAppPreference.java b/src/com/android/settings/widget/RestrictedAppPreference.java index 9518c693e30..e33c34287da 100644 --- a/src/com/android/settings/widget/RestrictedAppPreference.java +++ b/src/com/android/settings/widget/RestrictedAppPreference.java @@ -18,12 +18,13 @@ package com.android.settings.widget; import android.content.Context; import android.os.UserHandle; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreferenceHelper; diff --git a/src/com/android/settings/widget/RtlCompatibleViewPager.java b/src/com/android/settings/widget/RtlCompatibleViewPager.java index ac28e7bf4cb..68caaa78ea5 100644 --- a/src/com/android/settings/widget/RtlCompatibleViewPager.java +++ b/src/com/android/settings/widget/RtlCompatibleViewPager.java @@ -17,12 +17,13 @@ package com.android.settings.widget; import android.content.Context; +import android.os.Parcel; import android.os.Parcelable; -import androidx.viewpager.widget.ViewPager; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; -import android.os.Parcel; + +import androidx.viewpager.widget.ViewPager; import java.util.Locale; diff --git a/src/com/android/settings/widget/ScrollToParentEditText.java b/src/com/android/settings/widget/ScrollToParentEditText.java index 705e918ea5e..9d5394bb8fa 100644 --- a/src/com/android/settings/widget/ScrollToParentEditText.java +++ b/src/com/android/settings/widget/ScrollToParentEditText.java @@ -21,9 +21,6 @@ import android.graphics.Rect; import android.util.AttributeSet; import android.view.View; import android.view.ViewParent; -import android.widget.EditText; - -import com.android.settings.widget.ImeAwareEditText; /** * An EditText that, instead of scrolling to itself when focused, will request scrolling to its diff --git a/src/com/android/settings/widget/SeekBarPreference.java b/src/com/android/settings/widget/SeekBarPreference.java index 2919b36ce59..2c57bb31a94 100644 --- a/src/com/android/settings/widget/SeekBarPreference.java +++ b/src/com/android/settings/widget/SeekBarPreference.java @@ -20,8 +20,6 @@ import android.content.Context; import android.content.res.TypedArray; import android.os.Parcel; import android.os.Parcelable; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.KeyEvent; @@ -30,7 +28,9 @@ import android.view.accessibility.AccessibilityNodeInfo; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; -import com.android.settings.widget.DefaultIndicatorSeekBar; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.PreferenceViewHolder; + import com.android.settingslib.RestrictedPreference; /** diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java index adc386ac0c0..74108aa20d1 100644 --- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java +++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java @@ -16,7 +16,6 @@ package com.android.settings.widget; -import android.app.ActivityManager; import android.app.PendingIntent; import android.appwidget.AppWidgetManager; import android.appwidget.AppWidgetProvider; @@ -33,14 +32,10 @@ import android.net.Uri; import android.net.wifi.WifiManager; import android.os.AsyncTask; import android.os.Handler; -import android.os.IPowerManager; import android.os.PowerManager; import android.os.Process; -import android.os.RemoteException; -import android.os.ServiceManager; import android.os.UserManager; import android.provider.Settings; -import android.provider.Settings.Secure; import android.util.Log; import android.widget.RemoteViews; diff --git a/src/com/android/settings/widget/SlidingTabLayout.java b/src/com/android/settings/widget/SlidingTabLayout.java index ef024ef5a12..3ae4e3cc6c7 100644 --- a/src/com/android/settings/widget/SlidingTabLayout.java +++ b/src/com/android/settings/widget/SlidingTabLayout.java @@ -17,7 +17,6 @@ package com.android.settings.widget; import android.content.Context; -import androidx.viewpager.widget.PagerAdapter; import android.util.AttributeSet; import android.view.Gravity; import android.view.LayoutInflater; @@ -26,6 +25,8 @@ import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.viewpager.widget.PagerAdapter; + import com.android.settings.R; /** diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java index 857075bfb5a..52a3288dc59 100644 --- a/src/com/android/settings/widget/SwitchBar.java +++ b/src/com/android/settings/widget/SwitchBar.java @@ -23,9 +23,6 @@ import android.content.res.TypedArray; import android.graphics.Rect; import android.os.Parcel; import android.os.Parcelable; -import androidx.annotation.ColorInt; -import androidx.annotation.StringRes; -import androidx.annotation.VisibleForTesting; import android.text.SpannableStringBuilder; import android.text.TextUtils; import android.text.style.TextAppearanceSpan; @@ -39,6 +36,10 @@ import android.widget.LinearLayout; import android.widget.Switch; import android.widget.TextView; +import androidx.annotation.ColorInt; +import androidx.annotation.StringRes; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/widget/SwitchBarController.java b/src/com/android/settings/widget/SwitchBarController.java index ede02afbeed..e471c7a1b70 100644 --- a/src/com/android/settings/widget/SwitchBarController.java +++ b/src/com/android/settings/widget/SwitchBarController.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import android.widget.Switch; + import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; /* diff --git a/src/com/android/settings/widget/TwoStateButtonPreference.java b/src/com/android/settings/widget/TwoStateButtonPreference.java index 0f71268975f..b154fb4193c 100644 --- a/src/com/android/settings/widget/TwoStateButtonPreference.java +++ b/src/com/android/settings/widget/TwoStateButtonPreference.java @@ -18,12 +18,13 @@ package com.android.settings.widget; import android.content.Context; import android.content.res.TypedArray; -import androidx.annotation.VisibleForTesting; -import androidx.core.content.res.TypedArrayUtils; import android.util.AttributeSet; import android.view.View; import android.widget.Button; +import androidx.annotation.VisibleForTesting; +import androidx.core.content.res.TypedArrayUtils; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java b/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java index 0243a6873e8..9285c3d2c14 100644 --- a/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java +++ b/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java @@ -18,10 +18,12 @@ package com.android.settings.widget; import android.app.AlertDialog; import android.content.res.TypedArray; import android.os.Bundle; +import android.widget.ArrayAdapter; + import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceDialogFragment; import androidx.preference.ListPreference; -import android.widget.ArrayAdapter; +import androidx.preference.PreferenceDialogFragment; + import com.android.settingslib.core.instrumentation.Instrumentable; import java.util.ArrayList; diff --git a/src/com/android/settings/widget/ValidatedEditTextPreference.java b/src/com/android/settings/widget/ValidatedEditTextPreference.java index 8ffffb7f656..ea2d04b948c 100644 --- a/src/com/android/settings/widget/ValidatedEditTextPreference.java +++ b/src/com/android/settings/widget/ValidatedEditTextPreference.java @@ -18,18 +18,18 @@ package com.android.settings.widget; import android.app.AlertDialog; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceViewHolder; import android.text.Editable; import android.text.InputType; import android.text.TextUtils; import android.text.TextWatcher; import android.util.AttributeSet; -import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceViewHolder; + import com.android.settingslib.CustomEditTextPreference; /** diff --git a/src/com/android/settings/widget/VideoPreference.java b/src/com/android/settings/widget/VideoPreference.java index 4ec98296e1b..b5874b1bdc3 100644 --- a/src/com/android/settings/widget/VideoPreference.java +++ b/src/com/android/settings/widget/VideoPreference.java @@ -22,9 +22,6 @@ import android.content.res.TypedArray; import android.graphics.SurfaceTexture; import android.media.MediaPlayer; import android.net.Uri; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.util.Log; import android.view.Surface; @@ -32,6 +29,10 @@ import android.view.TextureView; import android.view.View; import android.widget.ImageView; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; /** diff --git a/src/com/android/settings/widget/WorkOnlyCategory.java b/src/com/android/settings/widget/WorkOnlyCategory.java index 449916b6cfe..063b105dfb2 100644 --- a/src/com/android/settings/widget/WorkOnlyCategory.java +++ b/src/com/android/settings/widget/WorkOnlyCategory.java @@ -16,9 +16,10 @@ package com.android.settings.widget; import android.content.Context; import android.os.UserManager; -import androidx.preference.PreferenceCategory; import android.util.AttributeSet; +import androidx.preference.PreferenceCategory; + import com.android.settings.SelfAvailablePreference; import com.android.settings.Utils; diff --git a/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java b/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java index c643b8ca05d..19687fcfff1 100644 --- a/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java +++ b/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java @@ -22,7 +22,6 @@ import android.content.Context; import com.android.internal.util.ArrayUtils; import com.android.settings.applications.AppStateAppOpsBridge; -import com.android.settings.applications.AppStateAppOpsBridge.PermissionState; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.ApplicationsState.AppFilter; diff --git a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java index 2fefb43e7a1..a883826801f 100644 --- a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java +++ b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java @@ -18,10 +18,11 @@ package com.android.settings.wifi; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/wifi/ChangeWifiStateDetails.java b/src/com/android/settings/wifi/ChangeWifiStateDetails.java index 1c59ddd02b7..03e98208afb 100644 --- a/src/com/android/settings/wifi/ChangeWifiStateDetails.java +++ b/src/com/android/settings/wifi/ChangeWifiStateDetails.java @@ -16,28 +16,22 @@ package com.android.settings.wifi; -import android.Manifest.permission; import android.app.AlertDialog; import android.app.AppOpsManager; import android.content.Context; import android.os.Bundle; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.SwitchPreference; -import com.android.internal.annotations.VisibleForTesting; 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; -import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; - import com.android.settings.wifi.AppStateChangeWifiStateBridge.WifiSettingsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; -import com.android.settingslib.applications.ApplicationsState.AppFilter; - -import static android.app.AppOpsManager.MODE_ALLOWED; -import static android.app.AppOpsManager.MODE_IGNORED; public class ChangeWifiStateDetails extends AppInfoWithHeader implements OnPreferenceChangeListener { diff --git a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java index 1e3723e3570..3efbbff7f3b 100644 --- a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java +++ b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java @@ -17,9 +17,10 @@ package com.android.settings.wifi; import android.content.Context; +import android.view.View; + import androidx.annotation.DrawableRes; import androidx.preference.PreferenceViewHolder; -import android.view.View; import com.android.settings.R; import com.android.settingslib.wifi.AccessPoint; diff --git a/src/com/android/settings/wifi/LinkablePreference.java b/src/com/android/settings/wifi/LinkablePreference.java index e4cb95bcebd..033740a65c0 100644 --- a/src/com/android/settings/wifi/LinkablePreference.java +++ b/src/com/android/settings/wifi/LinkablePreference.java @@ -17,14 +17,16 @@ package com.android.settings.wifi; import android.content.Context; -import androidx.annotation.Nullable; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.Spannable; import android.text.method.LinkMovementMethod; import android.text.style.TextAppearanceSpan; import android.util.AttributeSet; import android.widget.TextView; + +import androidx.annotation.Nullable; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.LinkifyUtils; /** diff --git a/src/com/android/settings/wifi/LongPressAccessPointPreference.java b/src/com/android/settings/wifi/LongPressAccessPointPreference.java index 213589b9de4..ab7abf2a31b 100644 --- a/src/com/android/settings/wifi/LongPressAccessPointPreference.java +++ b/src/com/android/settings/wifi/LongPressAccessPointPreference.java @@ -17,9 +17,9 @@ package com.android.settings.wifi; import android.app.Fragment; import android.content.Context; + import androidx.preference.PreferenceViewHolder; -import android.widget.ImageView; -import com.android.settings.R; + import com.android.settingslib.wifi.AccessPoint; import com.android.settingslib.wifi.AccessPointPreference; diff --git a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java index baf273c21db..a46a82873a5 100644 --- a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java +++ b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java @@ -22,10 +22,11 @@ import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; import android.provider.Settings; -import androidx.preference.SwitchPreference; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/wifi/RequestToggleWiFiActivity.java b/src/com/android/settings/wifi/RequestToggleWiFiActivity.java index c45db69ba04..25e7a6e69b5 100644 --- a/src/com/android/settings/wifi/RequestToggleWiFiActivity.java +++ b/src/com/android/settings/wifi/RequestToggleWiFiActivity.java @@ -26,10 +26,12 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.net.wifi.WifiManager; import android.os.Bundle; -import androidx.annotation.NonNull; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; + +import androidx.annotation.NonNull; + import com.android.internal.app.AlertActivity; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java index 25c97b203e0..56072c1c1b0 100644 --- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java +++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java @@ -24,11 +24,12 @@ import android.icu.text.Collator; import android.net.wifi.WifiManager; import android.os.Bundle; import android.os.Handler; +import android.util.Log; +import android.widget.Toast; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Log; -import android.widget.Toast; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java index 6bc2d98f796..3b71037037b 100644 --- a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java +++ b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java @@ -13,11 +13,11 @@ import android.net.Uri; import android.os.Handler; import android.os.Looper; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/wifi/WifiAPITest.java b/src/com/android/settings/wifi/WifiAPITest.java index 35f700de815..6d3c3b8ef42 100644 --- a/src/com/android/settings/wifi/WifiAPITest.java +++ b/src/com/android/settings/wifi/WifiAPITest.java @@ -22,11 +22,12 @@ import android.app.AlertDialog; import android.content.DialogInterface; import android.net.wifi.WifiManager; import android.os.Bundle; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.Editable; import android.widget.EditText; +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; diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 22de20c445c..de67c10baac 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -34,11 +34,9 @@ import android.net.wifi.WifiEnterpriseConfig; import android.net.wifi.WifiEnterpriseConfig.Eap; import android.net.wifi.WifiEnterpriseConfig.Phase2; import android.net.wifi.WifiInfo; -import android.os.Handler; import android.os.UserManager; import android.security.Credentials; import android.security.KeyStore; -import androidx.annotation.VisibleForTesting; import android.text.Editable; import android.text.InputType; import android.text.TextUtils; @@ -59,6 +57,8 @@ import android.widget.ScrollView; import android.widget.Spinner; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.android.settings.ProxySelector; import com.android.settings.R; import com.android.settingslib.Utils; diff --git a/src/com/android/settings/wifi/WifiDetailPreference.java b/src/com/android/settings/wifi/WifiDetailPreference.java index f7ddac7c6fc..2567a429932 100644 --- a/src/com/android/settings/wifi/WifiDetailPreference.java +++ b/src/com/android/settings/wifi/WifiDetailPreference.java @@ -17,12 +17,13 @@ package com.android.settings.wifi; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.widget.TextView; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; /** diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java index 02ce0e4d4e8..5d0dc69437c 100644 --- a/src/com/android/settings/wifi/WifiDialogActivity.java +++ b/src/com/android/settings/wifi/WifiDialogActivity.java @@ -24,9 +24,10 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.net.wifi.WifiManager.ActionListener; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.SetupWizardUtils; import com.android.settingslib.wifi.AccessPoint; import com.android.setupwizardlib.util.WizardManagerHelper; diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java index 018119b3e57..8efefc37628 100644 --- a/src/com/android/settings/wifi/WifiEnabler.java +++ b/src/com/android/settings/wifi/WifiEnabler.java @@ -28,9 +28,10 @@ import android.net.wifi.WifiManager; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; 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; diff --git a/src/com/android/settings/wifi/WifiInfoPreferenceController.java b/src/com/android/settings/wifi/WifiInfoPreferenceController.java index ec17b08d121..0676d96ce03 100644 --- a/src/com/android/settings/wifi/WifiInfoPreferenceController.java +++ b/src/com/android/settings/wifi/WifiInfoPreferenceController.java @@ -23,10 +23,11 @@ import android.content.IntentFilter; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.provider.Settings; +import android.text.TextUtils; + import androidx.core.text.BidiFormatter; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java index cbbe8ba2c01..692608ccbe8 100644 --- a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java +++ b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java @@ -16,13 +16,14 @@ package com.android.settings.wifi; import android.content.Context; + import androidx.preference.PreferenceScreen; -import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.R; -import com.android.settings.widget.SummaryUpdater; -import com.android.settings.widget.MasterSwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.widget.MasterSwitchController; +import com.android.settings.widget.MasterSwitchPreference; +import com.android.settings.widget.SummaryUpdater; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.lifecycle.LifecycleObserver; diff --git a/src/com/android/settings/wifi/WifiNoInternetDialog.java b/src/com/android/settings/wifi/WifiNoInternetDialog.java index b175665a943..e12529d42d5 100644 --- a/src/com/android/settings/wifi/WifiNoInternetDialog.java +++ b/src/com/android/settings/wifi/WifiNoInternetDialog.java @@ -16,6 +16,10 @@ package com.android.settings.wifi; +import static android.net.ConnectivityManager.ACTION_PROMPT_LOST_VALIDATION; +import static android.net.ConnectivityManager.ACTION_PROMPT_UNVALIDATED; +import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED; + import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -37,10 +41,6 @@ import com.android.internal.app.AlertActivity; import com.android.internal.app.AlertController; import com.android.settings.R; -import static android.net.ConnectivityManager.ACTION_PROMPT_LOST_VALIDATION; -import static android.net.ConnectivityManager.ACTION_PROMPT_UNVALIDATED; -import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED; - public final class WifiNoInternetDialog extends AlertActivity implements DialogInterface.OnClickListener { private static final String TAG = "WifiNoInternetDialog"; diff --git a/src/com/android/settings/wifi/WifiPickerActivity.java b/src/com/android/settings/wifi/WifiPickerActivity.java index 51904418f8f..079d90f158e 100644 --- a/src/com/android/settings/wifi/WifiPickerActivity.java +++ b/src/com/android/settings/wifi/WifiPickerActivity.java @@ -16,6 +16,7 @@ package com.android.settings.wifi; import android.content.Intent; + import androidx.preference.PreferenceFragment; import com.android.settings.ButtonBarHandler; diff --git a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java index 9db766cb3be..f1eafd047dd 100644 --- a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java +++ b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java @@ -25,11 +25,12 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 7aeaba65669..3d13d12a13b 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -39,9 +39,6 @@ import android.os.Handler; import android.os.Looper; import android.os.PowerManager; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; import android.util.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; @@ -50,6 +47,10 @@ import android.view.MenuItem; import android.view.View; import android.widget.Toast; +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; diff --git a/src/com/android/settings/wifi/WifiSliceBuilder.java b/src/com/android/settings/wifi/WifiSliceBuilder.java index 68aa9a5b8d3..b2aabdfff47 100644 --- a/src/com/android/settings/wifi/WifiSliceBuilder.java +++ b/src/com/android/settings/wifi/WifiSliceBuilder.java @@ -19,8 +19,6 @@ package com.android.settings.wifi; import static android.app.slice.Slice.EXTRA_TOGGLE_STATE; import static android.provider.SettingsSlicesContract.KEY_WIFI; -import static androidx.slice.builders.ListBuilder.ICON_IMAGE; - import android.annotation.ColorInt; import android.app.PendingIntent; import android.content.ContentResolver; @@ -32,6 +30,12 @@ import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.net.wifi.WifiSsid; import android.provider.SettingsSlicesContract; +import android.text.TextUtils; + +import androidx.core.graphics.drawable.IconCompat; +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; @@ -39,14 +43,6 @@ import com.android.settings.SubSettings; import com.android.settings.Utils; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.slices.SliceBroadcastReceiver; -import com.android.settings.slices.SliceBuilderUtils; - -import androidx.slice.Slice; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.SliceAction; - -import androidx.core.graphics.drawable.IconCompat; -import android.text.TextUtils; /** * Utility class to build a Wifi Slice, and handle all associated actions. diff --git a/src/com/android/settings/wifi/WifiSummaryUpdater.java b/src/com/android/settings/wifi/WifiSummaryUpdater.java index d0b4f606946..86961132c42 100644 --- a/src/com/android/settings/wifi/WifiSummaryUpdater.java +++ b/src/com/android/settings/wifi/WifiSummaryUpdater.java @@ -24,9 +24,10 @@ import android.net.ConnectivityManager; import android.net.NetworkScoreManager; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.widget.SummaryUpdater; import com.android.settingslib.wifi.WifiStatusTracker; diff --git a/src/com/android/settings/wifi/WifiUtils.java b/src/com/android/settings/wifi/WifiUtils.java index fd9d27e9c20..4ffc589834e 100644 --- a/src/com/android/settings/wifi/WifiUtils.java +++ b/src/com/android/settings/wifi/WifiUtils.java @@ -27,6 +27,7 @@ import android.provider.Settings; import android.text.TextUtils; import com.android.settingslib.wrapper.PackageManagerWrapper; + import java.nio.charset.StandardCharsets; public class WifiUtils { diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java index 0c088257abb..0dcdf54d707 100644 --- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java +++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java @@ -24,11 +24,12 @@ import android.content.Context; import android.content.Intent; import android.location.LocationManager; import android.provider.Settings; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettings.java b/src/com/android/settings/wifi/calling/WifiCallingSettings.java index a9c0ee9f54c..ab04eca4afd 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSettings.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSettings.java @@ -19,7 +19,6 @@ package com.android.settings.wifi.calling; import android.app.Fragment; import android.app.FragmentManager; import android.os.Bundle; -import androidx.legacy.app.FragmentPagerAdapter; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.util.Log; @@ -27,6 +26,8 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.legacy.app.FragmentPagerAdapter; + import com.android.ims.ImsManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java index 15137cc821a..76b5c7ae8a4 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java @@ -25,10 +25,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; import android.os.PersistableBundle; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceScreen; import android.telephony.CarrierConfigManager; import android.telephony.PhoneStateListener; import android.telephony.SubscriptionManager; @@ -41,6 +37,11 @@ import android.view.ViewGroup; import android.widget.Switch; import android.widget.TextView; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceScreen; + import com.android.ims.ImsConfig; import com.android.ims.ImsManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java index a80e9d03c94..e8e33ef0531 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java @@ -26,13 +26,13 @@ import android.content.Intent; import android.net.Uri; import android.os.PersistableBundle; import android.provider.Settings; -import androidx.core.graphics.drawable.IconCompat; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; +import androidx.core.graphics.drawable.IconCompat; import androidx.slice.Slice; import androidx.slice.builders.ListBuilder; import androidx.slice.builders.SliceAction; diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java index fda5ce49347..f3460aff172 100644 --- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java @@ -40,15 +40,16 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.os.Handler; -import androidx.core.text.BidiFormatter; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.Log; import android.widget.ImageView; import android.widget.Toast; +import androidx.core.text.BidiFormatter; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java b/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java index 097a49be3ed..341b2279994 100644 --- a/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java @@ -20,16 +20,12 @@ import android.app.backup.BackupManager; import android.content.Context; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; -import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.DropDownPreference; import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.core.BasePreferenceController; -import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; /** diff --git a/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java b/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java index fed363d9dc7..ac8113bcc5b 100644 --- a/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java +++ b/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.wifi.p2p; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java b/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java index 84ce1ee04c6..ade423a486a 100644 --- a/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java +++ b/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.wifi.p2p; import android.content.Context; import android.net.wifi.p2p.WifiP2pDevice; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java index 5a087e527aa..6caef94c6fa 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java @@ -19,10 +19,12 @@ package com.android.settings.wifi.p2p; import android.content.Context; import android.net.wifi.WifiManager; import android.net.wifi.p2p.WifiP2pDevice; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.widget.ImageView; + +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; public class WifiP2pPeer extends Preference { diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPersistentGroup.java b/src/com/android/settings/wifi/p2p/WifiP2pPersistentGroup.java index 4d2b43364a8..702942ca7fb 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pPersistentGroup.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pPersistentGroup.java @@ -18,8 +18,8 @@ package com.android.settings.wifi.p2p; import android.content.Context; import android.net.wifi.p2p.WifiP2pGroup; + import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; public class WifiP2pPersistentGroup extends Preference { diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java index 78af007bdbd..4f3b7fd63b3 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.net.wifi.WifiManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java index 302981d9d6f..6afd03acf6d 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java @@ -38,8 +38,6 @@ import android.net.wifi.p2p.WifiP2pManager.PeerListListener; import android.net.wifi.p2p.WifiP2pManager.PersistentGroupInfoListener; import android.os.Bundle; import android.os.SystemProperties; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.InputFilter; import android.text.TextUtils; import android.util.Log; @@ -49,6 +47,9 @@ import android.view.MenuItem; import android.widget.EditText; import android.widget.Toast; +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; diff --git a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java index 8dde24bdb47..fafcb037ae2 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java @@ -23,9 +23,10 @@ import android.content.Context; import android.content.res.Resources; import android.icu.text.ListFormatter; import android.net.wifi.WifiConfiguration; -import androidx.preference.Preference; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.widget.HotspotApBandSelectionPreference; diff --git a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java index d8c3cfd8a34..01a0b5707cb 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java @@ -18,8 +18,9 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java index e689916475d..94e9209defb 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java index 465170a2c46..8d9e8586f44 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.net.wifi.WifiConfiguration; +import android.text.TextUtils; + import androidx.preference.EditTextPreference; import androidx.preference.Preference; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.widget.ValidatedEditTextPreference; diff --git a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java index 3e0297e741b..2ae6b586ae6 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java @@ -24,10 +24,11 @@ import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.provider.Settings; +import android.text.BidiFormatter; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.BidiFormatter; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java index 176573f5846..fb2ce97db6b 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java @@ -18,13 +18,13 @@ 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; import androidx.preference.Preference; -import android.util.Log; import com.android.settings.widget.ValidatedEditTextPreference; -import com.android.settings.wifi.WifiUtils; public class WifiTetherSSIDPreferenceController extends WifiTetherBasePreferenceController implements ValidatedEditTextPreference.Validator { diff --git a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java index 0f08cbb709a..f97a20911eb 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java @@ -1,8 +1,8 @@ package com.android.settings.wifi.tether; import android.content.Context; -import android.content.res.Resources; import android.net.wifi.WifiConfiguration; + import androidx.preference.ListPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java index 0de74043541..7d9afde77bc 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java @@ -27,9 +27,10 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.os.Bundle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; 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; diff --git a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java index 554cc0e3202..8d87b3284b2 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java @@ -27,6 +27,7 @@ import android.net.wifi.WifiManager; import android.os.Handler; import android.os.Looper; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import com.android.settings.datausage.DataSaverBackend; diff --git a/tests/robotests/src/com/android/settings/HelpTrampolineTest.java b/tests/robotests/src/com/android/settings/HelpTrampolineTest.java index 23639ff70ea..cfef3c26c39 100644 --- a/tests/robotests/src/com/android/settings/HelpTrampolineTest.java +++ b/tests/robotests/src/com/android/settings/HelpTrampolineTest.java @@ -17,6 +17,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.Shadows.shadowOf; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/LegalSettingsTest.java b/tests/robotests/src/com/android/settings/LegalSettingsTest.java index af0b757a182..3bd8d984c34 100644 --- a/tests/robotests/src/com/android/settings/LegalSettingsTest.java +++ b/tests/robotests/src/com/android/settings/LegalSettingsTest.java @@ -16,6 +16,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MasterClearTest.java index 64dab16118c..c693a5ff9c8 100644 --- a/tests/robotests/src/com/android/settings/MasterClearTest.java +++ b/tests/robotests/src/com/android/settings/MasterClearTest.java @@ -17,6 +17,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doNothing; diff --git a/tests/robotests/src/com/android/settings/PrivacySettingsTest.java b/tests/robotests/src/com/android/settings/PrivacySettingsTest.java index 6ad520a6603..f024e4c8684 100644 --- a/tests/robotests/src/com/android/settings/PrivacySettingsTest.java +++ b/tests/robotests/src/com/android/settings/PrivacySettingsTest.java @@ -19,9 +19,9 @@ package com.android.settings; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java b/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java index 8753b1d3900..a10a4a41b10 100644 --- a/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java +++ b/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java @@ -17,6 +17,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.app.Activity; diff --git a/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java b/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java index 1cca8428761..36256263eeb 100644 --- a/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java @@ -16,6 +16,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -27,9 +28,11 @@ import android.app.KeyguardManager; import android.content.Intent; import android.os.Bundle; import android.util.AttributeSet; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.RestrictedPreferenceHelper; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java index e370cda5c96..35f9e2876ab 100644 --- a/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java @@ -15,8 +15,6 @@ */ package com.android.settings; -import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.times; diff --git a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java index dc1fe2b223d..6015e2789e8 100644 --- a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java +++ b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java @@ -28,6 +28,7 @@ import android.content.SharedPreferences; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; + import androidx.annotation.NonNull; import com.android.settings.fuelgauge.batterytip.AnomalyConfigJobService; diff --git a/tests/robotests/src/com/android/settings/SettingsInitializeTest.java b/tests/robotests/src/com/android/settings/SettingsInitializeTest.java index f09723f507f..1c1c14ce0cc 100644 --- a/tests/robotests/src/com/android/settings/SettingsInitializeTest.java +++ b/tests/robotests/src/com/android/settings/SettingsInitializeTest.java @@ -21,18 +21,20 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.content.Intent; import android.content.pm.ShortcutInfo; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowShortcutManager; -import java.util.ArrayList; -import java.util.List; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import java.util.ArrayList; +import java.util.List; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowShortcutManager.class}) public class SettingsInitializeTest { diff --git a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java index 0e1384ddd71..8e35cfb3e56 100644 --- a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java +++ b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java @@ -17,6 +17,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java index a7b91f5fb1f..2a32ed7fae9 100644 --- a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -26,11 +27,12 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.content.Context; import android.os.Bundle; +import android.view.View; + import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; -import android.view.View; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java index f2bd79c4c6d..83a727258fe 100644 --- a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java +++ b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java @@ -17,6 +17,7 @@ package com.android.settings; import static com.android.settings.testutils.ResIdSubject.assertResId; + import static com.google.common.truth.Truth.assertThat; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java index 1b717772a6f..3cb9c4c3da0 100644 --- a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java @@ -18,20 +18,21 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.Config; import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResourcesImpl.class) diff --git a/tests/robotests/src/com/android/settings/UtilsTest.java b/tests/robotests/src/com/android/settings/UtilsTest.java index 92aedcfe6a6..5f2abba37ef 100644 --- a/tests/robotests/src/com/android/settings/UtilsTest.java +++ b/tests/robotests/src/com/android/settings/UtilsTest.java @@ -17,6 +17,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java index 30debd623d2..0fbf4977eea 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java @@ -21,12 +21,11 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; import android.content.Context; -import android.os.Bundle; import android.os.Vibrator; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.R; @@ -35,7 +34,6 @@ import com.android.settings.testutils.XmlTestUtils; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java index 8392412e325..b00d64d8eb5 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java @@ -37,15 +37,14 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; +import org.robolectric.shadow.api.Shadow; +import org.robolectric.shadows.ShadowAccessibilityManager; +import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.robolectric.shadow.api.Shadow; -import org.robolectric.shadows.ShadowAccessibilityManager; -import org.xmlpull.v1.XmlPullParserException; - @RunWith(SettingsRobolectricTestRunner.class) public class AccessibilitySlicePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java index aad6454e99f..96b03236245 100644 --- a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java @@ -18,9 +18,10 @@ package com.android.settings.accessibility; import static com.google.common.truth.Truth.assertThat; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java index 98b1770668f..020906aee5c 100644 --- a/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java @@ -23,6 +23,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java index 128e33bb351..968f3b14314 100644 --- a/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java @@ -27,6 +27,7 @@ import static org.mockito.Mockito.spy; import android.content.Context; import android.content.res.Resources; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java index dda2ae5e780..3a7fd56b9c7 100644 --- a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java @@ -17,15 +17,18 @@ package com.android.settings.accessibility; import static android.provider.Settings.System.NOTIFICATION_VIBRATION_INTENSITY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.res.Resources; import android.os.Vibrator; import android.provider.Settings; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java index 1fe64c7f4e1..26b3a6c8e2c 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.accessibility; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java index c1f54d60524..6a22ac946a8 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java @@ -21,11 +21,12 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import android.os.Bundle; -import androidx.annotation.XmlRes; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.XmlRes; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java index ecd2ff9ce57..a44b62ba0b4 100644 --- a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java @@ -21,11 +21,12 @@ import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_MEDIUM; import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_OFF; import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import android.app.Activity; import android.content.Context; import android.content.res.Resources; import android.os.UserManager; @@ -33,7 +34,8 @@ import android.os.Vibrator; import android.provider.Settings; import com.android.settings.R; -import com.android.settings.accessibility.VibrationPreferenceFragment.VibrationIntensityCandidateInfo; +import com.android.settings.accessibility.VibrationPreferenceFragment + .VibrationIntensityCandidateInfo; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.widget.CandidateInfo; @@ -41,7 +43,6 @@ import com.android.settingslib.widget.CandidateInfo; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java index ade7dc94ce5..7c70f1df30c 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java @@ -15,9 +15,13 @@ */ package com.android.settings.accounts; -import static com.android.settings.accounts.AccountDashboardFragmentTest.ShadowAuthenticationHelper.LABELS; -import static com.android.settings.accounts.AccountDashboardFragmentTest.ShadowAuthenticationHelper.TYPES; +import static com.android.settings.accounts.AccountDashboardFragmentTest + .ShadowAuthenticationHelper.LABELS; +import static com.android.settings.accounts.AccountDashboardFragmentTest + .ShadowAuthenticationHelper.TYPES; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java index 558e074160c..8cb30df6b0c 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java @@ -16,6 +16,7 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; @@ -30,6 +31,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; import android.os.UserHandle; + import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java index 59b0aeeb6ee..fa049c67f7e 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java @@ -17,19 +17,22 @@ package com.android.settings.accounts; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; import android.accounts.Account; import android.app.Activity; -import androidx.lifecycle.LifecycleOwner; import android.os.Bundle; import android.os.UserHandle; +import android.widget.TextView; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; -import android.widget.TextView; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java index 1cc0c3a6643..5e252152974 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -37,11 +38,12 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.os.UserManager; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.AccessiblePreferenceCategory; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java index 4e317d7d8cc..672baaab576 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; @@ -27,6 +28,7 @@ import android.content.Context; import android.content.Intent; import android.content.SyncAdapterType; import android.os.UserHandle; + import androidx.preference.Preference; import com.android.settings.R; @@ -42,7 +44,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java index 4e42bc90154..330ef42a793 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java @@ -29,8 +29,9 @@ import android.accounts.AuthenticatorDescription; import android.content.Context; import android.content.pm.PackageManager; import android.os.UserHandle; -import androidx.preference.PreferenceFragment; + import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java index 5db22652de2..623a76efff2 100644 --- a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -29,6 +30,7 @@ import android.content.Intent; import android.content.pm.ResolveInfo; import android.content.pm.UserInfo; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java index ce1dcb2712b..0803d78d0f2 100644 --- a/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.accounts; import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM; + import static com.google.common.truth.Truth.assertThat; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java index 56659efb51c..ff4e7a49acd 100644 --- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java @@ -38,10 +38,11 @@ import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; import android.os.UserManager; +import android.widget.Button; + import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; -import android.widget.Button; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java index 97210b332b4..faa1bde3ab6 100644 --- a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java index 605b8de1558..0c7da76fc40 100644 --- a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -31,6 +32,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.net.Uri; import android.os.UserHandle; + import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java index 581b30015fd..545cb58a243 100644 --- a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -31,6 +32,7 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PermissionGroupInfo; import android.content.pm.PermissionInfo; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java index fa426291bc8..04a1237150a 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java @@ -1,10 +1,12 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java index dcc6a1e912e..27094e8b176 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java index 8365db2ec45..780a715925d 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java index cd41c8612aa..082bbad08f2 100644 --- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; diff --git a/tests/robotests/src/com/android/settings/applications/DataSaverControllerTest.java b/tests/robotests/src/com/android/settings/applications/DataSaverControllerTest.java index 22140bb5c4d..c2089188db4 100644 --- a/tests/robotests/src/com/android/settings/applications/DataSaverControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/DataSaverControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java index d17fc87156a..402d18d8e84 100644 --- a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/applications/DeviceAdministratorsControllerTest.java b/tests/robotests/src/com/android/settings/applications/DeviceAdministratorsControllerTest.java index ad7e615ce78..808cf4d5ee8 100644 --- a/tests/robotests/src/com/android/settings/applications/DeviceAdministratorsControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/DeviceAdministratorsControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/EnabledVrListenersControllerTest.java b/tests/robotests/src/com/android/settings/applications/EnabledVrListenersControllerTest.java index b36472031f7..0aecf8b9c6b 100644 --- a/tests/robotests/src/com/android/settings/applications/EnabledVrListenersControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/EnabledVrListenersControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java index 4fa30eb9219..3378492d27d 100644 --- a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java +++ b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/applications/HighPowerAppsControllerTest.java b/tests/robotests/src/com/android/settings/applications/HighPowerAppsControllerTest.java index 6dfaa7c59eb..1bb444f47a7 100644 --- a/tests/robotests/src/com/android/settings/applications/HighPowerAppsControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/HighPowerAppsControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java index d97194852fc..1e8ab77b8a7 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.argThat; diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java index 119d3ebcffb..1fefc2d7229 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.argThat; diff --git a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java index ff64a844161..da65165c1e9 100644 --- a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java @@ -17,13 +17,15 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; +import android.view.LayoutInflater; + import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceViewHolder; -import android.view.LayoutInflater; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/PremiumSmsControllerTest.java b/tests/robotests/src/com/android/settings/applications/PremiumSmsControllerTest.java index cad4100adea..e0cbed08b70 100644 --- a/tests/robotests/src/com/android/settings/applications/PremiumSmsControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/PremiumSmsControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java index 2876b62f7dc..e3e45fb4dca 100644 --- a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; @@ -41,10 +42,11 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.UserHandle; import android.os.UserManager; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAccessSettingsTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAccessSettingsTest.java index fd71af7ac1b..035ae3ce92c 100644 --- a/tests/robotests/src/com/android/settings/applications/SpecialAccessSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/SpecialAccessSettingsTest.java @@ -16,6 +16,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java index bd8b36e470b..06cc2e30915 100644 --- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java @@ -17,10 +17,12 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java index 79ada895aec..f9cb01b9881 100644 --- a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java index cf423f7a635..b119f1da77e 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.argThat; @@ -40,6 +41,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; import android.os.UserManager; + import androidx.preference.PreferenceScreen; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java index e1e115446ae..fc523b9c3c6 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyDouble; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; @@ -32,6 +33,7 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.os.BatteryStats; import android.os.Bundle; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java index bab73b55a2a..210ee742c4b 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -33,6 +34,7 @@ import android.content.pm.ApplicationInfo; import android.net.ConnectivityManager; import android.net.INetworkStatsSession; import android.os.Bundle; + import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java index 1c8569d1c2f..b7bc79a9a4f 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications.appinfo; import static androidx.lifecycle.Lifecycle.Event.ON_START; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; @@ -28,16 +30,17 @@ import static org.mockito.Mockito.when; import android.app.ActionBar; import android.app.Activity; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.graphics.drawable.Drawable; -import androidx.preference.PreferenceScreen; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java index 909d574ee48..ce8ef15f9cc 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java @@ -20,7 +20,9 @@ import static com.android.settings.applications.appinfo.AppInfoDashboardFragment import static com.android.settings.applications.appinfo.AppInfoDashboardFragment .UNINSTALL_ALL_USERS_MENU; import static com.android.settings.applications.appinfo.AppInfoDashboardFragment.UNINSTALL_UPDATES; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.doNothing; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java index 1616c83767a..e68f8d39955 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications.appinfo; import static com.android.settings.applications.appinfo.AppInfoDashboardFragment.SUB_INFO_FRAGMENT; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -26,6 +28,7 @@ import static org.mockito.Mockito.when; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.os.Bundle; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java index b640f9f5ce5..30152a40775 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.any; @@ -35,6 +36,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java index 1c0d89705da..3ec6ebbf5b2 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -26,6 +27,7 @@ import android.content.Context; import android.content.Intent; import android.os.UserManager; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java index 9678ecb3874..2547c271749 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications.appinfo; import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -28,6 +30,7 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java index c18e5213bd5..b3d0a0dbaf9 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -27,6 +28,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java index 505f25ea2e0..aff29181eb6 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.argThat; @@ -27,6 +28,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java index b554a4de0f5..2a1cc4dd7bd 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java @@ -17,17 +17,14 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; + import static org.robolectric.Shadows.shadowOf; import android.app.Application; import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.ResolveInfo; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java index 76c33cb57cb..d3d7cdc2f5d 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -28,6 +29,7 @@ import android.app.LoaderManager; import android.content.Context; import android.content.pm.ApplicationInfo; import android.os.Bundle; + import androidx.preference.Preference; import com.android.settings.applications.AppStorageSettings; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java index f577d1ca1eb..e07f66e9762 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageInfo; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java index ae61a51549e..f41ccf89603 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java @@ -25,6 +25,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java index 34a9e2e2fa8..f6abb5bc197 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java index 999e802b10d..e630a4c5d37 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java index 5536cff17fe..a0b802e80f1 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java index cd6a3aef625..ac79a4fba6a 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java index 35f3d618098..3b9ce3d450b 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java index c8f19db21de..3cc4cfe6caa 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.applications.appinfo; import static android.Manifest.permission.SYSTEM_ALERT_WINDOW; import static android.Manifest.permission.WRITE_SETTINGS; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -27,6 +29,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageInfo; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java index 6f134ae53a1..4e5ed28fed7 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; + import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.nullable; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java index ef909070240..a81035f17cc 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -24,6 +25,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java index 4f8961570a6..d636fa468ef 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java index 7c99fd0a609..b256ec0be9f 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.argThat; @@ -36,14 +37,15 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.Button; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java index 7e1584842e3..af38db39038 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java index b5b600a1807..557be39ae16 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java @@ -17,12 +17,14 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailsTest.java index b804b228ea8..8d705d07209 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailsTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureSettingsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureSettingsTest.java index 87dedade843..feb6157a8fb 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java index 9cdd2eaaa1c..358bd302b4d 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications.appinfo; import static android.content.Intent.EXTRA_PACKAGE_NAME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; @@ -25,6 +27,7 @@ import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.ResolveInfo; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java index e702cd46143..00ecece3355 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.applications.appinfo; import static android.Manifest.permission.SYSTEM_ALERT_WINDOW; import static android.Manifest.permission.WRITE_SETTINGS; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -27,6 +29,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageInfo; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java index e83fbf861fe..74a38511c9b 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java @@ -17,17 +17,20 @@ package com.android.settings.applications.assist; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java index dd4422a7f2e..10197aed4c8 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications.assist; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -26,11 +28,12 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java index 0ccba4d6ad2..b140faec43f 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.assist; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java index 320471c1b4f..02c1b8b4392 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.assist; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java index 93d59420912..2ea6b283bbd 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java @@ -26,9 +26,10 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.content.Context; import android.os.UserManager; -import androidx.preference.PreferenceScreen; import android.util.Pair; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java index 97e38a03c4c..b9a131643e9 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java @@ -18,12 +18,14 @@ package com.android.settings.applications.defaultapps; import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java index 35ce6ca9c83..06756234063 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java index c7156d00e63..cc64cbd7607 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,9 +26,10 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; import android.provider.Settings; -import androidx.preference.Preference; import android.view.autofill.AutofillManager; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.wrapper.PackageManagerWrapper; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java index 15a1a67fe59..cea8213a54f 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -37,8 +38,6 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.wrapper.PackageManagerWrapper; -import java.util.ArrayList; -import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -47,6 +46,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.util.ReflectionHelpers; +import java.util.ArrayList; +import java.util.List; + @RunWith(SettingsRobolectricTestRunner.class) public class DefaultBrowserPickerTest { diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java index fa2a62c5c59..f9ee145a049 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; @@ -27,6 +28,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ResolveInfo; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java index 3fe7dc1891b..47c9ee5b458 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java index 9e85e0e3e9e..d50df2145c5 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyList; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java index 34869b6d3b3..af1130f0c35 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyList; @@ -31,9 +32,9 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -49,9 +50,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -import java.util.Arrays; -import java.util.Collections; - @RunWith(SettingsRobolectricTestRunner.class) public class DefaultHomePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java index 454a5644781..1d4b5c0485d 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -26,6 +27,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.nfc.NfcAdapter; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.nfc.PaymentBackend; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java index 9b088cf3932..13789302765 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java @@ -16,8 +16,11 @@ package com.android.settings.applications.manageapplications; -import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ENABLED; -import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_USAGE_ACCESS; +import static com.android.settings.applications.manageapplications.AppFilterRegistry + .FILTER_APPS_ENABLED; +import static com.android.settings.applications.manageapplications.AppFilterRegistry + .FILTER_APPS_USAGE_ACCESS; + import static com.google.common.truth.Truth.assertThat; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java index 4c94e0a03c5..7409136251b 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java @@ -16,26 +16,43 @@ package com.android.settings.applications.manageapplications; -import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ALL; -import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_INSTALL_SOURCES; -import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_WHITELIST; - +import static com.android.settings.applications.manageapplications.AppFilterRegistry + .FILTER_APPS_ALL; +import static com.android.settings.applications.manageapplications.AppFilterRegistry + .FILTER_APPS_INSTALL_SOURCES; +import static com.android.settings.applications.manageapplications.AppFilterRegistry + .FILTER_APPS_POWER_WHITELIST; import static com.android.settings.applications.manageapplications.AppFilterRegistry .FILTER_APPS_RECENT; -import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_USAGE_ACCESS; -import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WITH_OVERLAY; -import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WRITE_SETTINGS; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_GAMES; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_HIGH_POWER; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MAIN; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MANAGE_SOURCES; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MOVIES; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_NOTIFICATION; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_OVERLAY; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_PHOTOGRAPHY; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_STORAGE; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_USAGE_ACCESS; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_WRITE_SETTINGS; +import static com.android.settings.applications.manageapplications.AppFilterRegistry + .FILTER_APPS_USAGE_ACCESS; +import static com.android.settings.applications.manageapplications.AppFilterRegistry + .FILTER_APPS_WITH_OVERLAY; +import static com.android.settings.applications.manageapplications.AppFilterRegistry + .FILTER_APPS_WRITE_SETTINGS; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_GAMES; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_HIGH_POWER; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_MAIN; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_MANAGE_SOURCES; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_MOVIES; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_NOTIFICATION; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_OVERLAY; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_PHOTOGRAPHY; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_STORAGE; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_USAGE_ACCESS; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_WRITE_SETTINGS; + import static com.google.common.truth.Truth.assertThat; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java index 5b0b275e16b..2ae95618572 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.manageapplications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java index d4e8a0caced..244daf9b2d4 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java @@ -18,12 +18,15 @@ package com.android.settings.applications.manageapplications; import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_DRAGGING; 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.ManageApplications.LIST_TYPE_MAIN; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_NOTIFICATION; -import static com.google.common.truth.Truth.assertThat; -import static junit.framework.Assert.assertEquals; +import static com.android.settings.applications.manageapplications.AppFilterRegistry + .FILTER_APPS_ALL; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_MAIN; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_NOTIFICATION; + +import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Matchers.any; @@ -41,13 +44,14 @@ import android.content.Context; import android.os.Bundle; import android.os.Looper; import android.os.UserManager; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.LoadingViewController; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java index 776235c811c..09bbe508631 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.manageapplications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.nullable; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java index fc8f272f3d0..6828668d221 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.manageapplications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.nullable; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java index ee05740c0ca..1c290c484aa 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.backup; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,6 +25,7 @@ import static org.mockito.Mockito.when; import android.app.backup.BackupManager; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java index cd0ba792223..50676c5624d 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java @@ -17,6 +17,7 @@ package com.android.settings.backup; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.isA; diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java index d156a2daee5..f3cb850ee59 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java @@ -17,6 +17,7 @@ package com.android.settings.backup; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java index 0a258bbe78b..fb3f947eba2 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java @@ -17,12 +17,14 @@ package com.android.settings.backup; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.Intent; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java index d9261c2ec64..448a5c7212b 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java index ced8fc4a2e4..d40e87f6b8e 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java @@ -15,21 +15,27 @@ */ package com.android.settings.bluetooth; -import android.bluetooth.BluetoothProfile; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothProfile; import android.content.Context; import android.media.AudioManager; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; - import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settingslib.bluetooth.CachedBluetoothDevice; +import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.HeadsetProfile; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; -import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import org.junit.Before; import org.junit.Test; @@ -42,13 +48,6 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.Collection; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowAudioManager.class}) public class AvailableMediaBluetoothDeviceUpdaterTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java index 17d46a87fe4..c23d282ce3b 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java index 2f838081b0a..764c2e96f61 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import android.content.Context; + import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java index 0c2a381c59b..ca053f0443f 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java @@ -19,12 +19,13 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.app.Activity; -import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothClass; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothManager; import android.content.Context; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java index 2567f534f66..4d295e57ea1 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.verify; @@ -31,7 +32,6 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; import com.android.settings.widget.EntityHeaderController; - import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.LocalBluetoothManager; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java index 74499483ac0..d836a975a64 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -27,8 +28,9 @@ import android.bluetooth.BluetoothClass; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceCategory; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java index 4be27753f87..8304059fccc 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java index a15d26cc34d..8910418425b 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; @@ -25,6 +26,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java index 1162f8e6ad9..55dd8ec24d9 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java index 3ce585ab83c..265819adac2 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; @@ -27,6 +28,7 @@ import static org.mockito.Mockito.when; import android.app.Fragment; import android.app.FragmentTransaction; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java index c1024c8c3c3..0d053724c79 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -23,21 +24,21 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.bluetooth.BluetoothDevice; -import android.bluetooth.BluetoothProfile; import android.content.Context; import android.content.Intent; + import androidx.preference.Preference; import com.android.settings.SettingsActivity; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settingslib.bluetooth.A2dpProfile; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.HeadsetProfile; -import com.android.settingslib.bluetooth.A2dpProfile; - import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java index 4bb093c8035..da004561554 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java @@ -32,11 +32,10 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.UserManager; -import androidx.preference.PreferenceViewHolder; import android.view.View; -import android.widget.Switch; -import com.android.settings.R; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.widget.SwitchBar; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java index 7d2257af0c3..f9129757b52 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java @@ -21,10 +21,11 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; -import android.content.pm.PackageManager; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; import android.os.Bundle; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java index 3060734e491..3cf880e3e06 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; @@ -30,6 +31,7 @@ import static org.mockito.Mockito.verify; import android.bluetooth.BluetoothAdapter; import android.content.Context; import android.content.res.Resources; + import androidx.preference.PreferenceGroup; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java index 759c0cdb002..5fbd18f97fb 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.fail; import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java index 7a0a05d0cdb..be86241fd4a 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.spy; @@ -25,6 +26,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.Intent; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java index fe705aaeb40..4c1cce11570 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java @@ -24,6 +24,16 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; +import android.content.Intent; +import android.content.res.Resources; + +import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.widget.SliceLiveData; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -33,10 +43,6 @@ import com.android.settings.testutils.shadow.ShadowLocalBluetoothProfileManager; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; -import android.content.Intent; -import android.content.res.Resources; -import androidx.core.graphics.drawable.IconCompat; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -46,13 +52,6 @@ import org.robolectric.annotation.Config; import java.util.List; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.widget.SliceLiveData; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowLocalBluetoothAdapter.class, ShadowLocalBluetoothProfileManager.class}) public class BluetoothSliceBuilderTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java index 2ac1ed8fea2..500d534f4ee 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doCallRealMethod; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java index ccd57f5d66f..39d0f419b6e 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java @@ -18,9 +18,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; import android.content.Context; import android.provider.Settings; diff --git a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java index 483df01a6b8..86203754fa6 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.bluetooth.BluetoothProfile; import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothProfile; import android.content.Context; import android.media.AudioManager; @@ -34,10 +34,10 @@ import com.android.settings.dashboard.DashboardFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settingslib.bluetooth.CachedBluetoothDevice; +import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.HeadsetProfile; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; -import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java index 12bcd74c079..14dffe61820 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.eq; @@ -27,6 +28,7 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.content.res.Resources; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java index 96f09e21bc6..731b4d62c69 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java @@ -17,12 +17,12 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.content.Context; import android.os.Bundle; import android.view.View; import android.view.ViewGroup; @@ -43,7 +43,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.RuntimeEnvironment; import org.robolectric.util.FragmentTestUtil; import org.robolectric.util.ReflectionHelpers; diff --git a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java index c9a93acf50e..5387b3412d1 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; diff --git a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java index 5a8f2490e7a..2af45bc3ebb 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java index 547727beced..a88d8ff446e 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.bluetooth.BluetoothProfile; import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothProfile; import android.content.Context; import com.android.settings.connecteddevice.DevicePreferenceCallback; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java index c73313d63ff..4f02062cc63 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java @@ -29,11 +29,10 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java index ce5580242f2..e3060e710a1 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java @@ -17,12 +17,19 @@ package com.android.settings.connecteddevice; import static com.android.settings.core.BasePreferenceController.AVAILABLE; +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.spy; +import static org.robolectric.Shadows.shadowOf; + import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + import com.android.settings.R; import com.android.settings.nfc.NfcPreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,10 +39,6 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowNfcAdapter; import org.robolectric.util.ReflectionHelpers; -import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.spy; -import static org.robolectric.Shadows.shadowOf; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowNfcAdapter.class) public class AdvancedConnectedDeviceControllerTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java index 1b78f129d42..a1e7f222dbf 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java @@ -16,7 +16,7 @@ package com.android.settings.connecteddevice; import static com.google.common.truth.Truth.assertThat; -; + import android.provider.SearchIndexableResource; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,6 +34,8 @@ import org.robolectric.annotation.Config; import java.util.List; +; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothPan.class, ShadowUserManager.class, ShadowConnectivityManager.class}) diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java index 6d0c9fbc6d6..8927670c356 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java @@ -19,6 +19,7 @@ import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; @@ -29,6 +30,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageManager; import android.media.AudioManager; + import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java index 44b7b8fb79e..e192f8969cf 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java @@ -31,7 +31,6 @@ import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; import java.util.List; -import java.util.stream.Collectors; @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothDashboardFragmentTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java index 52715b084df..763e6050af8 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java @@ -26,9 +26,9 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.PackageManager; + import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java index ba2a697a781..92574bb0aa3 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.connecteddevice; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -26,13 +27,14 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import androidx.preference.PreferenceScreen; import android.text.BidiFormatter; import android.text.TextUtils; -import com.android.settings.core.BasePreferenceController; -import com.android.settings.bluetooth.AlwaysDiscoverable; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; +import com.android.settings.bluetooth.AlwaysDiscoverable; +import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowBluetoothPan; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java index 36cb1801807..8a14c3f7dd3 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java @@ -15,6 +15,15 @@ */ package com.android.settings.connecteddevice; +import static com.android.settings.core.BasePreferenceController.AVAILABLE; +import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + import android.content.Context; import android.content.pm.PackageManager; @@ -31,11 +40,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import static com.android.settings.core.BasePreferenceController.AVAILABLE; -import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; -import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.*; - @RunWith(SettingsRobolectricTestRunner.class) public class PreviouslyConnectedDevicePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java index b1d4cd81c27..e85626df5ed 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java @@ -17,15 +17,19 @@ package com.android.settings.connecteddevice; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import androidx.lifecycle.LifecycleOwner; + import android.content.Context; import android.content.pm.PackageManager; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceManager; + import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.dashboard.DashboardFragment; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java index 567b072fdda..9ad73bedb6e 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java @@ -17,6 +17,7 @@ package com.android.settings.connecteddevice.usb; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java index dca10d73390..8aec1f7af85 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.connecteddevice.usb; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java index 716c9776f5c..1e24a99b1b2 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java @@ -27,6 +27,7 @@ import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; import android.os.Handler; + import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java index 989a293fc1d..e25ea68c472 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java @@ -26,6 +26,7 @@ import android.app.Activity; import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; + import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java index 7550b451630..1c6b750bbe6 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java @@ -20,11 +20,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; -import androidx.preference.PreferenceFragment; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java index 2bc0ed965af..b3cecf83e24 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java @@ -28,10 +28,11 @@ import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; import android.os.Handler; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -44,7 +45,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) public class UsbDetailsPowerRoleControllerTest { diff --git a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java index a1f9bf4e85d..867dd3eddf5 100644 --- a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java @@ -20,6 +20,7 @@ import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_U import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING; import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyString; @@ -28,6 +29,9 @@ import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.slices.SliceData; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,10 +40,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class BasePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java index 16830668a06..7709fb3b0a5 100644 --- a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java @@ -25,6 +25,7 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.os.Bundle; + import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java index 8553f114d5b..3bcc2a2f3ff 100644 --- a/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java @@ -17,10 +17,10 @@ package com.android.settings.core; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.widget.SeekBarPreference; import com.android.settings.slices.SliceData; import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.widget.SeekBarPreference; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java index c60d002237d..c57c384ab19 100644 --- a/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.core; import static com.google.common.truth.Truth.assertThat; import android.content.Context; + import androidx.preference.SeekBarPreference; import com.android.settings.slices.SliceData; diff --git a/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java b/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java index 55a0acbec31..326f45e0311 100644 --- a/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java +++ b/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java @@ -17,6 +17,7 @@ package com.android.settings.core; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; diff --git a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java index beaaa52a82e..53fe9a8b454 100644 --- a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.core; import static com.google.common.truth.Truth.assertThat; import android.content.Context; + import androidx.preference.SwitchPreference; import com.android.settings.slices.SliceData; diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java index f0c2442d762..59082792e80 100644 --- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java +++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java @@ -16,6 +16,8 @@ package com.android.settings.core.instrumentation; +import static com.google.common.truth.Truth.assertWithMessage; + import android.app.Fragment; import android.util.ArraySet; @@ -26,8 +28,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import static com.google.common.truth.Truth.assertWithMessage; - /** * {@link CodeInspector} that verifies all fragments implements Instrumentable. */ diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java index 1b2f72742d3..030106ae2b7 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java @@ -16,6 +16,7 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; @@ -33,13 +34,14 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.os.Bundle; import android.service.settings.suggestions.Suggestion; -import androidx.recyclerview.widget.RecyclerView; import android.util.DisplayMetrics; import android.view.LayoutInflater; import android.view.View; import android.view.WindowManager; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.dashboard.conditional.Condition; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java index 94126da5ff3..c0db3a0261a 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java @@ -20,12 +20,15 @@ import static com.android.settings.dashboard.DashboardData.STABLE_ID_CONDITION_C import static com.android.settings.dashboard.DashboardData.STABLE_ID_CONDITION_FOOTER; import static com.android.settings.dashboard.DashboardData.STABLE_ID_SUGGESTION_CONDITION_DIVIDER; import static com.android.settings.dashboard.DashboardData.STABLE_ID_SUGGESTION_CONTAINER; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.app.PendingIntent; import android.service.settings.suggestions.Suggestion; + import androidx.annotation.NonNull; import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.ListUpdateCallback; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java index 78d3a09adf5..92b44707c04 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java @@ -17,6 +17,7 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -39,6 +40,7 @@ import android.graphics.drawable.Icon; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; + import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java index 7638a07f573..708f21b2caa 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java @@ -16,6 +16,7 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -29,6 +30,7 @@ import android.content.Context; import android.content.Intent; import android.graphics.drawable.Icon; import android.os.Bundle; + import androidx.preference.Preference; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java index 7bcd80d6fc8..d3aa59b9874 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java @@ -18,10 +18,11 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; -import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.Tile; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java index 189dd6b8f37..b08c47bea60 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java @@ -17,6 +17,7 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doNothing; @@ -29,6 +30,7 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.content.Context; + import androidx.recyclerview.widget.LinearLayoutManager; import com.android.settings.dashboard.conditional.ConditionManager; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java index e7014df7c6a..d5636a16d5b 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java @@ -17,11 +17,13 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.java b/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.java index 0c90660b114..c83dd79e43f 100644 --- a/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.java @@ -17,6 +17,7 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java index 0fac2fcbc56..d54ac3aca3b 100644 --- a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java @@ -17,6 +17,7 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBaseTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBaseTest.java index c72131fa8e2..c5c477940eb 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBaseTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBaseTest.java @@ -17,6 +17,7 @@ package com.android.settings.dashboard.conditional; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java index 9b5bec359ad..4a00a13ddea 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java @@ -16,6 +16,7 @@ package com.android.settings.dashboard.conditional; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java index 79f01f88dd0..91970c369b3 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java @@ -16,15 +16,17 @@ package com.android.settings.dashboard.conditional; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.dashboard.DashboardAdapter; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java index 6d5673151a2..434e008e409 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java @@ -16,6 +16,7 @@ package com.android.settings.dashboard.conditional; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java index 35940ce6720..f5ec8bbd669 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java @@ -15,6 +15,8 @@ */ package com.android.settings.dashboard.conditional; +import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.never; @@ -23,8 +25,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static com.google.common.truth.Truth.assertThat; - import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java index 66ef5a039b3..ceae3c20fbe 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java @@ -18,6 +18,7 @@ package com.android.settings.dashboard.conditional; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerVibrateConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/RingerVibrateConditionTest.java index a134fac5721..2bf1f98645b 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerVibrateConditionTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/RingerVibrateConditionTest.java @@ -18,6 +18,7 @@ package com.android.settings.dashboard.conditional; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java index dc492a93907..6f71ac82715 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java @@ -16,6 +16,7 @@ package com.android.settings.dashboard.suggestions; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java index c62f63d20a9..5a275227058 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java @@ -17,6 +17,7 @@ package com.android.settings.dashboard.suggestions; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -26,17 +27,14 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import android.app.ActivityManager; -import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; import android.hardware.fingerprint.FingerprintManager; -import android.provider.Settings.Secure; import android.service.settings.suggestions.Suggestion; import android.util.Pair; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.Settings.NightDisplaySuggestionActivity; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; @@ -54,7 +52,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java index 5ff88bd42e6..3a827960a32 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java @@ -17,6 +17,7 @@ package com.android.settings.dashboard.suggestions; import static android.content.Intent.EXTRA_COMPONENT_NAME; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java index 5de54ea2774..99a3629c05a 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.graphics.Color; diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java index 4f107e583c5..2d98879c391 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java @@ -31,11 +31,12 @@ import static org.mockito.Mockito.when; import android.content.pm.PackageManager; import android.net.NetworkPolicyManager; import android.os.Bundle; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import android.util.ArraySet; import android.view.View; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; diff --git a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java index 40c22c7444c..e3034f88c21 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java @@ -17,6 +17,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; @@ -26,9 +27,10 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.graphics.drawable.Drawable; -import androidx.preference.Preference; import android.util.ArraySet; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java index e4ed8bf9721..96767a27a25 100644 --- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java @@ -16,8 +16,10 @@ package com.android.settings.datausage; import static android.net.NetworkPolicy.CYCLE_NONE; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; import static org.mockito.Matchers.anyObject; @@ -31,10 +33,11 @@ import android.content.Context; import android.content.DialogInterface; import android.content.SharedPreferences; import android.os.Bundle; +import android.util.FeatureFlagUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceManager; import androidx.preference.SwitchPreference; -import android.util.FeatureFlagUtils; import com.android.settings.core.FeatureFlags; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java index dd05b772ea5..744096622fd 100644 --- a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java @@ -16,17 +16,19 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java index 00d02a3d90b..b969c3a914f 100644 --- a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java @@ -16,6 +16,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,8 +26,10 @@ import android.content.Context; import android.net.NetworkStatsHistory; import android.net.NetworkStatsHistory.Entry; import android.util.SparseIntArray; + import com.android.settings.graph.UsageView; import com.android.settings.testutils.SettingsRobolectricTestRunner; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java index 04b50305972..6fad6e52fa6 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java @@ -17,6 +17,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryLegacyTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryLegacyTest.java index 2216792836c..061c7952dbf 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryLegacyTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryLegacyTest.java @@ -17,6 +17,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; @@ -24,7 +25,6 @@ import android.content.Context; import android.net.ConnectivityManager; import android.text.format.Formatter; -import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java index e471e6d7629..d0a3e136d16 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java @@ -17,10 +17,12 @@ package com.android.settings.datausage; import static android.net.ConnectivityManager.TYPE_WIFI; + import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -32,11 +34,12 @@ import android.content.Context; import android.content.Intent; import android.net.ConnectivityManager; import android.net.NetworkTemplate; -import androidx.recyclerview.widget.RecyclerView; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java index 573bc74d037..8c520b40ceb 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java @@ -17,8 +17,8 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -29,7 +29,6 @@ import android.content.Intent; import android.graphics.Typeface; import android.net.NetworkTemplate; import android.os.Bundle; -import androidx.preference.PreferenceViewHolder; import android.telephony.SubscriptionManager; import android.view.LayoutInflater; import android.view.View; @@ -38,6 +37,8 @@ import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SubSettings; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java index 6f0ec9f55c1..e619399a504 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java @@ -17,6 +17,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java index a35c897df05..0270be4b4cd 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java @@ -17,6 +17,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java index 01639d40c0e..a8ad8aa083e 100644 --- a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java +++ b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java @@ -16,6 +16,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.nullable; @@ -30,6 +31,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.ApplicationInfo; import android.os.Process; + import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java index 8a3f8d34624..f1795f3d0e6 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java @@ -21,9 +21,10 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.content.Intent; import android.provider.Settings; -import androidx.preference.SwitchPreference; import android.text.format.DateFormat; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java index e725877eadf..4d1ba380a5e 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java index d0bacf7801e..11b2efdfc07 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java @@ -17,12 +17,14 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.robolectric.shadow.api.Shadow.extract; import android.content.Context; import android.net.ConnectivityManager; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java index 7fd5b46ac0a..0f5e0880b95 100644 --- a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java index 802d9edb120..ee495d361f6 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java index 58862ee2cb2..5180455fc49 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import android.content.Context; import android.content.Intent; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java index c6f99a3c656..d73c8db54f1 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java index 38aace86e7b..a8c09f26006 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java index de330855f13..365bfa2a33c 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java @@ -16,6 +16,8 @@ package com.android.settings.datetime.timezone; +import static com.google.common.truth.Truth.assertThat; + import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -29,8 +31,6 @@ import java.util.Locale; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static com.google.common.truth.Truth.assertThat; - @RunWith(SettingsRobolectricTestRunner.class) public class BaseTimeZoneAdapterTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java index aa0ba77d176..daa46a54ee1 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java @@ -16,6 +16,8 @@ package com.android.settings.datetime.timezone; +import static org.mockito.Mockito.mock; + import android.content.Context; import android.icu.util.TimeZone; @@ -35,8 +37,6 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; -import static org.mockito.Mockito.mock; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { BaseTimeZoneInfoPickerTest.ShadowDataFormat.class }) public class BaseTimeZoneInfoPickerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java index 4b86c503181..06d2b2bca7d 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java @@ -16,8 +16,11 @@ package com.android.settings.datetime.timezone; +import static com.google.common.truth.Truth.assertThat; + import android.app.Activity; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -26,9 +29,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import org.robolectric.RuntimeEnvironment; - -import static com.google.common.truth.Truth.assertThat; @RunWith(SettingsRobolectricTestRunner.class) public class BaseTimeZonePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java index 9d650cc45af..9f3453d542b 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java @@ -16,6 +16,11 @@ package com.android.settings.datetime.timezone; +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import android.content.Context; import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem; @@ -34,10 +39,6 @@ import java.util.List; import java.util.Locale; import java.util.stream.Collectors; -import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - @RunWith(SettingsRobolectricTestRunner.class) public class FixedOffsetPickerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java index 53fe2b6f9e0..6802e8aa30a 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java @@ -16,8 +16,11 @@ package com.android.settings.datetime.timezone; +import static com.google.common.truth.Truth.assertThat; + import android.app.Activity; import android.icu.util.TimeZone; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -27,8 +30,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import static com.google.common.truth.Truth.assertThat; - @RunWith(SettingsRobolectricTestRunner.class) public class FixedOffsetPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java index e07d8a687b6..f33311523dc 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java @@ -16,7 +16,10 @@ package com.android.settings.datetime.timezone; +import static com.google.common.truth.Truth.assertThat; + import android.app.Activity; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -26,8 +29,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import static com.google.common.truth.Truth.assertThat; - @RunWith(SettingsRobolectricTestRunner.class) public class RegionPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java index e5272704ecb..220e677f907 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java @@ -16,6 +16,8 @@ package com.android.settings.datetime.timezone; +import static com.google.common.truth.Truth.assertThat; + import android.icu.text.Collator; import com.android.settings.datetime.timezone.RegionZonePicker.TimeZoneInfoComparator; @@ -31,8 +33,6 @@ import java.util.Date; import java.util.List; import java.util.Locale; -import static com.google.common.truth.Truth.assertThat; - @RunWith(SettingsRobolectricTestRunner.class) public class RegionZonePickerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java index fc460793863..3c98985c12b 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java @@ -16,8 +16,11 @@ package com.android.settings.datetime.timezone; +import static com.google.common.truth.Truth.assertThat; + import android.app.Activity; import android.icu.util.TimeZone; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -27,8 +30,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import static com.google.common.truth.Truth.assertThat; - @RunWith(SettingsRobolectricTestRunner.class) public class RegionZonePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java index 55179070b58..4793118b955 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java @@ -16,6 +16,8 @@ package com.android.settings.datetime.timezone; +import static com.google.common.truth.Truth.assertThat; + import android.text.Spannable; import com.android.settings.R; @@ -25,8 +27,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import static com.google.common.truth.Truth.assertThat; - @RunWith(SettingsRobolectricTestRunner.class) public class SpannableUtilTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java index 725313e33f2..51d4a4b53a1 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime.timezone; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java index 0359cfcd7ae..d7fdd2ca4c5 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java @@ -17,19 +17,20 @@ package com.android.settings.datetime.timezone.model; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - import libcore.util.CountryTimeZones; import libcore.util.CountryTimeZones.TimeZoneMapping; import libcore.util.CountryZonesFinder; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java index 9e72d9896aa..b6a93227262 100644 --- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java @@ -6,6 +6,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java index 8a8c5a134f5..a766aa8599e 100644 --- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.deletionhelper; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.never; @@ -28,6 +29,7 @@ import android.app.FragmentManager; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; + import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; diff --git a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java index 2c0676dd541..2ed09420765 100644 --- a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java @@ -16,7 +16,9 @@ package com.android.settings.development; -import static com.android.settings.development.AbstractBluetoothA2dpPreferenceController.STREAMING_LABEL_ID; +import static com.android.settings.development.AbstractBluetoothA2dpPreferenceController + .STREAMING_LABEL_ID; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -25,10 +27,11 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothA2dp; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java index c91dea9c6e4..ef7e076e285 100644 --- a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,8 +26,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java index 24acf7316ba..2175f39a170 100644 --- a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java @@ -16,16 +16,21 @@ package com.android.settings.development; -import static com.android.settings.development.AllowAppsOnExternalPreferenceController.SETTING_VALUE_OFF; -import static com.android.settings.development.AllowAppsOnExternalPreferenceController.SETTING_VALUE_ON; +import static com.android.settings.development.AllowAppsOnExternalPreferenceController + .SETTING_VALUE_OFF; +import static com.android.settings.development.AllowAppsOnExternalPreferenceController + .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java index e793cbbc1a4..accd05b8a10 100644 --- a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java @@ -16,16 +16,20 @@ package com.android.settings.development; -import static com.android.settings.development.AnimatorDurationScalePreferenceController.ANIMATOR_DURATION_SCALE_SELECTOR; -import static com.android.settings.development.AnimatorDurationScalePreferenceController.DEFAULT_VALUE; +import static com.android.settings.development.AnimatorDurationScalePreferenceController + .ANIMATOR_DURATION_SCALE_SELECTOR; +import static com.android.settings.development.AnimatorDurationScalePreferenceController + .DEFAULT_VALUE; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.RemoteException; +import android.view.IWindowManager; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import android.view.IWindowManager; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java index 720c0819301..e1fc149a19e 100644 --- a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java @@ -16,16 +16,21 @@ package com.android.settings.development; -import static com.android.settings.development.AppsNotRespondingPreferenceController.SETTING_VALUE_OFF; -import static com.android.settings.development.AppsNotRespondingPreferenceController.SETTING_VALUE_ON; +import static com.android.settings.development.AppsNotRespondingPreferenceController + .SETTING_VALUE_OFF; +import static com.android.settings.development.AppsNotRespondingPreferenceController + .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java index 1e2e44eae51..6878c324107 100644 --- a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.when; import android.app.IActivityManager; import android.content.Context; import android.os.RemoteException; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java index bf6ed9483cd..69c8d2b506d 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java @@ -16,16 +16,19 @@ package com.android.settings.development; -import static com.android.settings.development.BluetoothA2dpHwOffloadPreferenceController.A2DP_OFFLOAD_DISABLED_PROPERTY; +import static com.android.settings.development.BluetoothA2dpHwOffloadPreferenceController + .A2DP_OFFLOAD_DISABLED_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java index 3da315a0b64..9cc74369bea 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java @@ -16,15 +16,19 @@ package com.android.settings.development; -import static com.android.settings.development.BluetoothAbsoluteVolumePreferenceController.BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY; +import static com.android.settings.development.BluetoothAbsoluteVolumePreferenceController + .BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java index 5c24bc76f77..a4da1973db6 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java index d1305971dad..eb1737b2b64 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java index 4f0815f367e..23eea32dc9c 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java index 168c61aa24d..516c8b28af5 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java index 3c62d2900f0..cb9337f4820 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java index 6da67ffc8e5..2d0c70a938c 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java @@ -16,14 +16,18 @@ package com.android.settings.development; -import static com.android.settings.development.BluetoothAvrcpVersionPreferenceController.BLUETOOTH_AVRCP_VERSION_PROPERTY; +import static com.android.settings.development.BluetoothAvrcpVersionPreferenceController + .BLUETOOTH_AVRCP_VERSION_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.os.SystemProperties; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java index 2bd3b09bfb7..0cab3ece6df 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java @@ -16,14 +16,18 @@ package com.android.settings.development; -import static com.android.settings.development.BluetoothDeviceNoNamePreferenceController.BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY; +import static com.android.settings.development.BluetoothDeviceNoNamePreferenceController + .BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java index 76eb4ac57b4..030aaa2f871 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java @@ -16,14 +16,18 @@ package com.android.settings.development; -import static com.android.settings.development.BluetoothMaxConnectedAudioDevicesPreferenceController.MAX_CONNECTED_AUDIO_DEVICES_PROPERTY; +import static com.android.settings.development + .BluetoothMaxConnectedAudioDevicesPreferenceController.MAX_CONNECTED_AUDIO_DEVICES_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.os.SystemProperties; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java index 98c0b8372cb..0d75bdb5be7 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java @@ -16,15 +16,19 @@ package com.android.settings.development; -import static com.android.settings.development.BluetoothSnoopLogPreferenceController.BLUETOOTH_BTSNOOP_ENABLE_PROPERTY; +import static com.android.settings.development.BluetoothSnoopLogPreferenceController + .BLUETOOTH_BTSNOOP_ENABLE_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java index f2593fceeef..b4ee99cb319 100644 --- a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java @@ -16,9 +16,13 @@ package com.android.settings.development; -import static com.android.settings.development.BugReportInPowerPreferenceController.SETTING_VALUE_OFF; -import static com.android.settings.development.BugReportInPowerPreferenceController.SETTING_VALUE_ON; +import static com.android.settings.development.BugReportInPowerPreferenceController + .SETTING_VALUE_OFF; +import static com.android.settings.development.BugReportInPowerPreferenceController + .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -27,8 +31,9 @@ import android.content.ContentResolver; import android.content.Context; import android.os.UserManager; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java index 77bd6b868ec..39fd368593a 100644 --- a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java index b61f49ae2f8..d39a8c2b8fd 100644 --- a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java @@ -17,15 +17,19 @@ package com.android.settings.development; import static com.android.settings.development.CameraLaserSensorPreferenceController.ENG_BUILD; -import static com.android.settings.development.CameraLaserSensorPreferenceController.USERDEBUG_BUILD; +import static com.android.settings.development.CameraLaserSensorPreferenceController + .USERDEBUG_BUILD; import static com.android.settings.development.CameraLaserSensorPreferenceController.USER_BUILD; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java index 6f7c22414bb..7dc9d34fb5e 100644 --- a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java @@ -16,8 +16,11 @@ package com.android.settings.development; -import static com.android.settings.development.ClearAdbKeysPreferenceController.RO_ADB_SECURE_PROPERTY_KEY; +import static com.android.settings.development.ClearAdbKeysPreferenceController + .RO_ADB_SECURE_PROPERTY_KEY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -29,8 +32,9 @@ import android.content.Context; import android.hardware.usb.IUsbManager; import android.os.RemoteException; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; diff --git a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java index 67ba7c4ed33..8d9549ab623 100644 --- a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java @@ -16,15 +16,19 @@ package com.android.settings.development; -import static com.android.settings.development.CoolColorTemperaturePreferenceController.COLOR_TEMPERATURE_PROPERTY; +import static com.android.settings.development.CoolColorTemperaturePreferenceController + .COLOR_TEMPERATURE_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java index 9ddfc4b45e0..3dd18d9dcee 100644 --- a/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.when; import android.app.UiModeManager; import android.content.Context; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java index 52ca56e80ba..d2019280a65 100644 --- a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java @@ -17,14 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; +import android.view.ThreadedRenderer; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import android.view.ThreadedRenderer; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java index fca76a4860c..a3728602796 100644 --- a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java @@ -17,14 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; +import android.view.ThreadedRenderer; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import android.view.ThreadedRenderer; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java index cddee7f683c..e737077eb13 100644 --- a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java index da32ce81909..fffcd4c8f0f 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java index c2ad6c34615..a6d11e903d8 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java @@ -18,14 +18,16 @@ package com.android.settings.development; import static androidx.lifecycle.Lifecycle.Event.ON_START; import static androidx.lifecycle.Lifecycle.Event.ON_STOP; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; -import android.app.Application; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.UserManager; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.widget.SwitchBar; diff --git a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java index 3e0d118df0a..8bc3ef68b17 100644 --- a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java index ae9added789..c90d8fbbce9 100644 --- a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java @@ -17,11 +17,11 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,11 +29,12 @@ import android.content.Context; import android.content.om.IOverlayManager; import android.content.om.OverlayInfo; import android.content.pm.PackageManager; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; import android.os.RemoteException; import android.view.DisplayCutout; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java index c16f4538b08..1319c979fce 100644 --- a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java @@ -16,16 +16,21 @@ package com.android.settings.development; -import static com.android.settings.development.EnableGnssRawMeasFullTrackingPreferenceController.SETTING_VALUE_OFF; -import static com.android.settings.development.EnableGnssRawMeasFullTrackingPreferenceController.SETTING_VALUE_ON; +import static com.android.settings.development.EnableGnssRawMeasFullTrackingPreferenceController + .SETTING_VALUE_OFF; +import static com.android.settings.development.EnableGnssRawMeasFullTrackingPreferenceController + .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java index f3b57306067..21d14ca3fa2 100644 --- a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java @@ -16,16 +16,21 @@ package com.android.settings.development; -import static com.android.settings.development.EnableGpuDebugLayersPreferenceController.SETTING_VALUE_OFF; -import static com.android.settings.development.EnableGpuDebugLayersPreferenceController.SETTING_VALUE_ON; +import static com.android.settings.development.EnableGpuDebugLayersPreferenceController + .SETTING_VALUE_OFF; +import static com.android.settings.development.EnableGpuDebugLayersPreferenceController + .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java index dd16a284be9..8bbb7e2f0fb 100644 --- a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java @@ -16,8 +16,11 @@ package com.android.settings.development; -import static com.android.settings.development.FileEncryptionPreferenceController.FILE_ENCRYPTION_PROPERTY_KEY; +import static com.android.settings.development.FileEncryptionPreferenceController + .FILE_ENCRYPTION_PROPERTY_KEY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.never; @@ -28,6 +31,7 @@ import android.content.Context; import android.os.RemoteException; import android.os.SystemProperties; import android.os.storage.IStorageManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java index 03f874fb2c8..aeda03235f0 100644 --- a/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java @@ -16,15 +16,19 @@ package com.android.settings.development; -import static com.android.settings.development.ForceGpuRenderingPreferenceController.HARDWARE_UI_PROPERTY; +import static com.android.settings.development.ForceGpuRenderingPreferenceController + .HARDWARE_UI_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java index aceb714cf40..a238e7630e8 100644 --- a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java index 7f97adc90c3..b58f756169a 100644 --- a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java @@ -16,10 +16,13 @@ package com.android.settings.development; -import static com.android.settings.development.FreeformWindowsPreferenceController.SETTING_VALUE_OFF; +import static com.android.settings.development.FreeformWindowsPreferenceController + .SETTING_VALUE_OFF; import static com.android.settings.development.FreeformWindowsPreferenceController.SETTING_VALUE_ON; import static com.android.settings.development.FreeformWindowsPreferenceController.USER_BUILD_TYPE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -27,8 +30,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java index abc1c91b273..d2e2d31ce56 100644 --- a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java @@ -17,15 +17,17 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import android.view.ThreadedRenderer; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java index fcf6b898db9..9ab7cec4a11 100644 --- a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java @@ -17,14 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import android.view.ThreadedRenderer; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java index db7e54694fd..9a69acfb220 100644 --- a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java @@ -16,7 +16,9 @@ package com.android.settings.development; -import static com.android.settings.development.HardwareOverlaysPreferenceController.SURFACE_FLINGER_READ_CODE; +import static com.android.settings.development.HardwareOverlaysPreferenceController + .SURFACE_FLINGER_READ_CODE; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.eq; @@ -30,8 +32,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.IBinder; import android.os.RemoteException; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowParcel; diff --git a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java index 4c65431cad8..9a80bea96cc 100644 --- a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java @@ -16,8 +16,11 @@ package com.android.settings.development; -import static com.android.settings.development.HdcpCheckingPreferenceController.HDCP_CHECKING_PROPERTY; +import static com.android.settings.development.HdcpCheckingPreferenceController + .HDCP_CHECKING_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,6 +28,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java index 3a1cc1976a4..a71f9b0848a 100644 --- a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.android.settings.development.KeepActivitiesPreferenceController.SETTING_VALUE_OFF; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -26,8 +27,9 @@ import android.app.IActivityManager; import android.content.Context; import android.os.RemoteException; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java index a86e18df3ed..b0af1d5676e 100644 --- a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java @@ -11,6 +11,7 @@ import android.app.backup.IBackupManager; import android.content.Context; import android.os.RemoteException; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java index 5fd3b219add..0fb88aaa84b 100644 --- a/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java @@ -16,7 +16,9 @@ package com.android.settings.development; -import static com.android.settings.development.LocalTerminalPreferenceController.TERMINAL_APP_PACKAGE; +import static com.android.settings.development.LocalTerminalPreferenceController + .TERMINAL_APP_PACKAGE; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -26,8 +28,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageManager; import android.os.UserManager; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.wrapper.PackageManagerWrapper; diff --git a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java index d65e830e92f..afbd806bb40 100644 --- a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java @@ -20,9 +20,10 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.SystemProperties; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java index f552a170643..aee0ba81900 100644 --- a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java @@ -20,6 +20,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java index ad3345536a2..7424753a66f 100644 --- a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java index d3763ae9e7b..abdd87cd029 100644 --- a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java @@ -1,7 +1,10 @@ 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 static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; @@ -16,6 +19,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java index e6a2d5ce351..965f756d6b9 100644 --- a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; */ import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -24,8 +25,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java index ce57fb51ddb..98f792bcc3c 100644 --- a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java @@ -16,8 +16,11 @@ 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 static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -31,9 +34,10 @@ import android.content.Context; import android.content.res.Resources; import android.os.UserManager; import android.service.oemlock.OemLockManager; -import androidx.preference.PreferenceScreen; import android.telephony.TelephonyManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedSwitchPreference; diff --git a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java index 28f369fec86..8140c324de0 100644 --- a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java @@ -18,15 +18,18 @@ package com.android.settings.development; import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.res.Resources; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java index 430e0ddcb19..768ccec1c6a 100644 --- a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java index 350122650b3..1708068d359 100644 --- a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java @@ -17,14 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; +import android.view.ThreadedRenderer; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import android.view.ThreadedRenderer; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java index 8785cf6a5ec..046636b9f32 100644 --- a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; */ import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java index 8e59b84e5c7..f79cbe0bf51 100644 --- a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -24,8 +25,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java index 78387e39e71..6b083da5d79 100644 --- a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java @@ -17,12 +17,14 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.provider.Settings; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java index d4cb4e03b15..7955db70b2c 100644 --- a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java @@ -16,8 +16,11 @@ 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 static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -28,6 +31,7 @@ import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java index 46c214740de..04b0b3f1ab6 100644 --- a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java @@ -17,14 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.IShortcutService; import android.os.RemoteException; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java index d373f1c09ad..2acd44ad092 100644 --- a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java @@ -16,15 +16,20 @@ package com.android.settings.development; -import static com.android.settings.development.ShowFirstCrashDialogPreferenceController.SETTING_VALUE_OFF; -import static com.android.settings.development.ShowFirstCrashDialogPreferenceController.SETTING_VALUE_ON; +import static com.android.settings.development.ShowFirstCrashDialogPreferenceController + .SETTING_VALUE_OFF; +import static com.android.settings.development.ShowFirstCrashDialogPreferenceController + .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java index c18857acce2..38ec01b80de 100644 --- a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java @@ -17,14 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import android.view.View; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java index 811550ff92e..e768e522d87 100644 --- a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java @@ -16,7 +16,9 @@ package com.android.settings.development; -import static com.android.settings.development.ShowSurfaceUpdatesPreferenceController.SURFACE_FLINGER_READ_CODE; +import static com.android.settings.development.ShowSurfaceUpdatesPreferenceController + .SURFACE_FLINGER_READ_CODE; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.eq; @@ -30,8 +32,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.IBinder; import android.os.RemoteException; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowParcel; diff --git a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java index d7eaecdb682..b6d02caf11e 100644 --- a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java index c136a29cb65..633e8e4055d 100644 --- a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java @@ -16,9 +16,13 @@ package com.android.settings.development; -import static com.android.settings.development.SimulateColorSpacePreferenceController.SETTING_VALUE_OFF; -import static com.android.settings.development.SimulateColorSpacePreferenceController.SETTING_VALUE_ON; +import static com.android.settings.development.SimulateColorSpacePreferenceController + .SETTING_VALUE_OFF; +import static com.android.settings.development.SimulateColorSpacePreferenceController + .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -26,6 +30,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.provider.Settings; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java index 40d439fe6d9..05edd14ee49 100644 --- a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -26,6 +27,7 @@ import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java index 1f0c9c553e5..3fceb1c7992 100644 --- a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java @@ -17,16 +17,18 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.os.RemoteException; import android.os.StrictMode; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import android.view.IWindowManager; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java index 895722e6257..e44aeb46cec 100644 --- a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java index e5c3e43abbc..8bd43745a75 100644 --- a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java @@ -16,17 +16,21 @@ package com.android.settings.development; -import static com.android.settings.development.TransitionAnimationScalePreferenceController.DEFAULT_VALUE; -import static com.android.settings.development.TransitionAnimationScalePreferenceController.TRANSITION_ANIMATION_SCALE_SELECTOR; +import static com.android.settings.development.TransitionAnimationScalePreferenceController + .DEFAULT_VALUE; +import static com.android.settings.development.TransitionAnimationScalePreferenceController + .TRANSITION_ANIMATION_SCALE_SELECTOR; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.os.RemoteException; +import android.view.IWindowManager; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import android.view.IWindowManager; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java index ba27bfb0b29..0c82bb46574 100644 --- a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java index 98ff9e4944d..471fad9c749 100644 --- a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java @@ -16,11 +16,11 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,6 +29,7 @@ import android.content.Intent; import android.content.pm.ResolveInfo; import android.provider.Settings; import android.provider.Settings.Global; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java index b152ea7c734..87d11350404 100644 --- a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java @@ -16,10 +16,14 @@ package com.android.settings.development; -import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_DEBUG_APP; -import static com.android.settings.development.WaitForDebuggerPreferenceController.SETTING_VALUE_OFF; +import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes + .REQUEST_CODE_DEBUG_APP; +import static com.android.settings.development.WaitForDebuggerPreferenceController + .SETTING_VALUE_OFF; import static com.android.settings.development.WaitForDebuggerPreferenceController.SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -32,8 +36,9 @@ import android.content.Context; import android.content.Intent; import android.os.RemoteException; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java index e09b9d9a0d6..e749ea64b3a 100644 --- a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java @@ -16,15 +16,20 @@ package com.android.settings.development; -import static com.android.settings.development.WifiConnectedMacRandomizationPreferenceController.SETTING_VALUE_OFF; -import static com.android.settings.development.WifiConnectedMacRandomizationPreferenceController.SETTING_VALUE_ON; +import static com.android.settings.development.WifiConnectedMacRandomizationPreferenceController + .SETTING_VALUE_OFF; +import static com.android.settings.development.WifiConnectedMacRandomizationPreferenceController + .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java index 528f3abc6c2..742bc7fe9ac 100644 --- a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java index 1359e992fee..daeff01ea63 100644 --- a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java @@ -21,8 +21,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.net.wifi.WifiManager; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java index e2db4f95d55..322eed78936 100644 --- a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java @@ -16,17 +16,21 @@ package com.android.settings.development; -import static com.android.settings.development.WindowAnimationScalePreferenceController.DEFAULT_VALUE; -import static com.android.settings.development.WindowAnimationScalePreferenceController.WINDOW_ANIMATION_SCALE_SELECTOR; +import static com.android.settings.development.WindowAnimationScalePreferenceController + .DEFAULT_VALUE; +import static com.android.settings.development.WindowAnimationScalePreferenceController + .WINDOW_ANIMATION_SCALE_SELECTOR; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.os.RemoteException; +import android.view.IWindowManager; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import android.view.IWindowManager; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java index 5fff256035e..53e45043d56 100644 --- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java @@ -17,14 +17,17 @@ package com.android.settings.development.featureflags; import static androidx.lifecycle.Lifecycle.Event.ON_START; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java index 09027050ed7..b34c6f0a754 100644 --- a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development.qstile; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -30,9 +31,10 @@ import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.os.RemoteException; import android.service.quicksettings.TileService; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.internal.statusbar.IStatusBarService; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java b/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java index 7644749daf0..636b067e17d 100644 --- a/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java +++ b/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java @@ -20,7 +20,9 @@ import static com.android.settings.development.qstile.DevelopmentTiles.WinscopeT .SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE; import static com.android.settings.development.qstile.DevelopmentTiles.WinscopeTrace .SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isNull; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java index b1073ac79a9..1560c51dd1e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java index 0011b1534b7..1411251c9e2 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -27,15 +28,16 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.app.Fragment; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.Build; import android.os.Process; import android.os.UserManager; import android.provider.Settings; +import android.text.BidiFormatter; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.BidiFormatter; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.search.DatabaseIndexingManager; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java index 169554d7110..32a0f042944 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java @@ -19,7 +19,9 @@ package com.android.settings.deviceinfo; import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY; import static com.android.settings.deviceinfo.DeviceInfoSettings.NON_SIM_PREFERENCES_COUNT; import static com.android.settings.deviceinfo.DeviceInfoSettings.SIM_PREFERENCES_COUNT; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -30,9 +32,10 @@ import android.app.Activity; import android.content.Context; import android.os.Build; import android.os.Bundle; -import androidx.preference.PreferenceScreen; import android.telephony.TelephonyManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java index c91683e00d4..a3c6d0a6802 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java @@ -16,7 +16,9 @@ package com.android.settings.deviceinfo; import static com.android.settings.deviceinfo.DeviceModelPreferenceController.getDeviceModel; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; @@ -24,6 +26,7 @@ import static org.mockito.Mockito.when; import android.app.Fragment; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java index 3e4b4e6fe2e..046bd844fb3 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java @@ -29,6 +29,7 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.os.Build; import android.provider.Settings; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java index e6b12d73e49..2c2c2f28ff7 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java @@ -16,10 +16,12 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java index f1e7f218631..b9bd46db455 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java @@ -16,11 +16,13 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; import android.app.Fragment; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java index c269f712b44..7b1de47555d 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java index 9207e157201..ec04947db57 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -29,10 +30,11 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.preference.PreferenceScreen; import android.telephony.TelephonyManager; import android.util.ArrayMap; +import androidx.preference.PreferenceScreen; + import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java index 565cdf0d866..4748135a461 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.deviceinfo; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -25,11 +26,12 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.SubscriptionInfo; import android.telephony.TelephonyManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java index 5f250dd0385..bad49f2ab60 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java index fea58e28810..24028d22ad8 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.when; @@ -24,6 +25,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java index fed2cbef516..bd0eaf37fa0 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; @@ -27,10 +28,11 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.provider.SearchIndexableResource; -import androidx.recyclerview.widget.RecyclerView; import android.util.SparseArray; import android.view.View; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.deviceinfo.storage.CachedStorageValuesHelper; import com.android.settings.deviceinfo.storage.StorageAsyncLoader; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java index 34ce2e626e1..d42b40ff7d6 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java @@ -16,13 +16,15 @@ package com.android.settings.deviceinfo; import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES; + import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.widget.ProgressBar; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java index 440a6f58657..61fbf1f48d5 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java @@ -16,6 +16,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java index f50c725ac5a..3e7ce7a9313 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java @@ -16,9 +16,13 @@ package com.android.settings.deviceinfo.firmwareversion; -import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController.BASEBAND_PROPERTY; -import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController.BASEBAND_VERSION_LABEL_ID; -import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController.BASEBAND_VERSION_VALUE_ID; +import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController + .BASEBAND_PROPERTY; +import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController + .BASEBAND_VERSION_LABEL_ID; +import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController + .BASEBAND_VERSION_VALUE_ID; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.robolectric.shadow.api.Shadow.extract; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java index 2db2e6fb8f2..21388818eaf 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java @@ -16,7 +16,9 @@ package com.android.settings.deviceinfo.firmwareversion; -import static com.android.settings.deviceinfo.firmwareversion.BuildNumberDialogController.BUILD_NUMBER_VALUE_ID; +import static com.android.settings.deviceinfo.firmwareversion.BuildNumberDialogController + .BUILD_NUMBER_VALUE_ID; + import static org.mockito.Mockito.verify; import android.os.Build; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java index 6b4da5bd949..7b07db48628 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java @@ -16,8 +16,11 @@ package com.android.settings.deviceinfo.firmwareversion; -import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController.FIRMWARE_VERSION_LABEL_ID; -import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController.FIRMWARE_VERSION_VALUE_ID; +import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController + .FIRMWARE_VERSION_LABEL_ID; +import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController + .FIRMWARE_VERSION_VALUE_ID; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java index 05bbdb14452..d519918f401 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo.firmwareversion; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -26,6 +27,7 @@ import android.app.Fragment; import android.app.FragmentManager; import android.content.Context; import android.os.Build; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java index f47c07e61b1..24f4874dbe0 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java @@ -16,7 +16,9 @@ package com.android.settings.deviceinfo.firmwareversion; -import static com.android.settings.deviceinfo.firmwareversion.KernelVersionDialogController.KERNEL_VERSION_VALUE_ID; +import static com.android.settings.deviceinfo.firmwareversion.KernelVersionDialogController + .KERNEL_VERSION_VALUE_ID; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java index 6b26fc190a8..ba38d77e7e0 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java @@ -16,8 +16,11 @@ package com.android.settings.deviceinfo.firmwareversion; -import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController.SECURITY_PATCH_LABEL_ID; -import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController.SECURITY_PATCH_VALUE_ID; +import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController + .SECURITY_PATCH_LABEL_ID; +import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController + .SECURITY_PATCH_VALUE_ID; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java index 658a60ad1b7..c317d2fa373 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java @@ -23,6 +23,7 @@ import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_I import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_MEID_NUMBER_VALUE; import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_MIN_NUMBER_VALUE; import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_PRL_VERSION_VALUE; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java index c068ac76d5a..2788939a740 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.deviceinfo.imei; import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA; import static android.telephony.TelephonyManager.PHONE_TYPE_GSM; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -29,9 +30,10 @@ import android.app.Fragment; import android.app.FragmentManager; import android.content.Context; import android.os.UserManager; +import android.telephony.TelephonyManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.telephony.TelephonyManager; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java index f612e55bb8a..649b6e2049a 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java @@ -45,6 +45,7 @@ import static com.android.settings.deviceinfo.simstatus.SimStatusDialogControlle .SIGNAL_STRENGTH_LABEL_ID; import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController .SIGNAL_STRENGTH_VALUE_ID; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -54,7 +55,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.PackageInfo; import android.os.PersistableBundle; @@ -66,6 +66,8 @@ import android.telephony.SubscriptionInfo; import android.telephony.TelephonyManager; import android.telephony.euicc.EuiccManager; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java index 8ccce3a2e02..5fe0adb39c5 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java @@ -27,9 +27,10 @@ import android.app.Fragment; import android.app.FragmentManager; import android.content.Context; import android.os.UserManager; +import android.telephony.TelephonyManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.telephony.TelephonyManager; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java index dea0e4f881d..77d6f188b43 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo.storage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -31,6 +32,7 @@ import android.content.ContentResolver; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java index 9f5638847d2..5da2cb8b095 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java @@ -18,21 +18,28 @@ package com.android.settings.deviceinfo.storage; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.CACHE_APPS_SIZE_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_APP_BYTES; -import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_AUDIO_BYTES; -import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_IMAGE_BYTES; -import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_TOTAL_BYTES; -import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_VIDEO_BYTES; +import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper + .EXTERNAL_AUDIO_BYTES; +import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper + .EXTERNAL_IMAGE_BYTES; +import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper + .EXTERNAL_TOTAL_BYTES; +import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper + .EXTERNAL_VIDEO_BYTES; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.FREE_BYTES_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.GAME_APPS_SIZE_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.MUSIC_APPS_SIZE_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.OTHER_APPS_SIZE_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.PHOTO_APPS_SIZE_KEY; -import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.SHARED_PREFERENCES_NAME; +import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper + .SHARED_PREFERENCES_NAME; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.TIMESTAMP_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.TOTAL_BYTES_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.USER_ID_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.VIDEO_APPS_SIZE_KEY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java index 1935c13a700..d525501c777 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.deviceinfo.storage; import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -27,10 +29,11 @@ import android.content.Context; import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; import android.os.UserManager; +import android.util.SparseArray; + import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; -import android.util.SparseArray; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java index a4107f5b186..092d0055fe7 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java @@ -16,9 +16,12 @@ package com.android.settings.deviceinfo.storage; import static com.android.settings.applications.manageapplications.ManageApplications.EXTRA_WORK_ID; -import static com.android.settings.applications.manageapplications.ManageApplications.EXTRA_WORK_ONLY; +import static com.android.settings.applications.manageapplications.ManageApplications + .EXTRA_WORK_ONLY; import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -36,11 +39,12 @@ import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.os.storage.VolumeInfo; -import androidx.preference.PreferenceScreen; import android.util.SparseArray; import android.view.LayoutInflater; import android.widget.LinearLayout; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java index c36af1b66d3..b51ae00549b 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.deviceinfo.storage; import static com.android.settings.TestUtils.GIGABYTE; import static com.android.settings.TestUtils.KILOBYTE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.spy; @@ -28,13 +30,14 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.storage.VolumeInfo; -import androidx.preference.PreferenceViewHolder; import android.text.format.Formatter; import android.view.LayoutInflater; import android.view.View; import android.widget.Button; import android.widget.LinearLayout; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java index 17ac6a98a05..419aab50b1e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.deviceinfo.storage; import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -27,9 +29,10 @@ import android.content.Context; import android.content.Intent; import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; +import android.util.SparseArray; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.SparseArray; import com.android.settings.SettingsActivity; import com.android.settings.SubSettings; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java index 7a19fdefa50..1e912ba2b29 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java @@ -1,5 +1,7 @@ package com.android.settings.deviceinfo.storage; +import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -10,8 +12,6 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.deviceinfo.PrivateStorageInfo; import com.android.settingslib.deviceinfo.StorageVolumeProvider; -import static com.google.common.truth.Truth.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java index 77390d34738..d3c8542fa10 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.display; import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_AMBIENT_DISPLAY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -29,6 +31,7 @@ import android.content.ContentResolver; import android.content.Context; import android.os.UserHandle; import android.provider.Settings; + import androidx.preference.SwitchPreference; import com.android.internal.hardware.AmbientDisplayConfiguration; diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java index 8d62d2fe5c5..def3d306f1c 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java @@ -17,11 +17,13 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.internal.hardware.AmbientDisplayConfiguration; diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplaySettingsTest.java index 4361b7c6f31..202873d85ca 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplaySettingsTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplaySettingsTest.java @@ -18,7 +18,6 @@ package com.android.settings.display; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/display/AppGridViewTest.java b/tests/robotests/src/com/android/settings/display/AppGridViewTest.java index ac3435d4812..05226c359de 100644 --- a/tests/robotests/src/com/android/settings/display/AppGridViewTest.java +++ b/tests/robotests/src/com/android/settings/display/AppGridViewTest.java @@ -17,6 +17,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java index 188cb92a646..9b82f05f552 100644 --- a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java @@ -19,6 +19,7 @@ package com.android.settings.display; import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE; import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC; import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL; + import static com.google.common.truth.Truth.assertThat; import android.content.ContentResolver; diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java index 5a31e3b4942..e4db3ee1ac5 100644 --- a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; @@ -26,6 +27,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.UserHandle; import android.provider.Settings; + import androidx.preference.SwitchPreference; import com.android.internal.view.RotationPolicy; diff --git a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java index 673abb0e93a..7814d3f9fde 100644 --- a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.display; import static android.provider.Settings.System.SHOW_BATTERY_PERCENT; + import static com.google.common.truth.Truth.assertThat; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java index b758531fb49..4122b14b734 100644 --- a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.display; import static android.content.Context.POWER_SERVICE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.reset; @@ -29,6 +31,7 @@ import android.content.ContentResolver; import android.content.Context; import android.os.PowerManager; import android.provider.Settings.System; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java index c7b65356c20..4be4eb8d680 100644 --- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.internal.app.ColorDisplayController; diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java index 40007759b10..e1f133d5154 100644 --- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java @@ -16,6 +16,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; @@ -26,6 +27,7 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.os.Bundle; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java index a4b0e54362f..30dedb6a001 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java @@ -21,14 +21,15 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings.Secure; +import android.view.View; + import androidx.preference.PreferenceScreen; -import android.view.View; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; - import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java index 20b03809209..945b50f9d5c 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java @@ -18,9 +18,11 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings.Secure; + import com.android.internal.app.ColorDisplayController; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceControllerTest.java index ed6618b1a60..c49c174be42 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceControllerTest.java @@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceControllerTest.java index c41300079da..a38c755a65c 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceControllerTest.java @@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java index 8168c203a5a..e43e7259ffc 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java @@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java index 40101a4bd79..99dcb5a7d96 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java @@ -18,8 +18,10 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings.Secure; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java index 7440f63d740..9c4c539c2d9 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java @@ -5,6 +5,7 @@ import static com.google.common.truth.Truth.assertThat; import android.app.Application; import android.content.ComponentName; import android.provider.Settings.Secure; + import com.android.internal.app.ColorDisplayController; import com.android.settings.R; import com.android.settings.Settings.NightDisplaySuggestionActivity; @@ -15,8 +16,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.Config; import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { diff --git a/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java index 6942fd84d6c..80d8987abeb 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java @@ -21,8 +21,8 @@ import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; - import com.android.settingslib.drawer.CategoryKey; + import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java index fe6686390b2..a5b34498a90 100644 --- a/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java @@ -17,10 +17,12 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; + import androidx.preference.SwitchPreference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java index ad50c2e18f3..b25e8e6e969 100644 --- a/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java @@ -28,6 +28,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java index 0a6957d170a..9d15ca06dfe 100644 --- a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -32,12 +33,13 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; -import androidx.preference.ListPreference; +import androidx.preference.ListPreference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java index 8627d5f1f1e..f5c2e26b591 100644 --- a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java @@ -17,9 +17,12 @@ package com.android.settings.display; import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT; + import static com.google.common.truth.Truth.assertThat; + import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; diff --git a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java index 963bb145b2e..b7fb5edc412 100644 --- a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java +++ b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java index 89ca00aa974..8a24241d4f4 100644 --- a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java index 103cb534c41..a26997c135a 100644 --- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java +++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.dream; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java index 44199404d73..db57a1e7977 100644 --- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.dream; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java index 07f4a9d10e9..b9703e2176b 100644 --- a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java +++ b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.dream; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java index 8aea9900481..fc7edc2827c 100644 --- a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java @@ -17,14 +17,16 @@ package com.android.settings.dream; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.PreferenceScreen; import android.view.View.OnClickListener; import android.widget.Button; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java index cf7c659bd9c..17c6cedab2b 100644 --- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java +++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.dream; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java index d6e2e10b567..e4f5cff1d76 100644 --- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java @@ -21,6 +21,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java index fa9702b9167..1c47d914204 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java @@ -17,13 +17,15 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.Preference; import android.text.format.DateUtils; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java index 287d33458d8..2da6a88df74 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java @@ -17,12 +17,14 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java index b18bf1c6ad5..8c704fca781 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java @@ -17,9 +17,11 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java index e1a992621ce..759edb37087 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java @@ -17,9 +17,11 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java index 18797934baa..5c197926a27 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java @@ -17,12 +17,15 @@ package com.android.settings.enterprise; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.UserInfo; + import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java index d2b305aa0bb..833efd4d3dd 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.enterprise; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -32,6 +34,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.UserInfo; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java index 72207d1b497..4e6db05cb87 100644 --- a/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java @@ -17,9 +17,11 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java index a3eeb712c4d..63c5981524b 100644 --- a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java index 2f31b28693a..48bb0ce125e 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import androidx.preference.Preference; diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java index 485ed468539..47db2c7aec0 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java @@ -17,9 +17,11 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java index d7d0abd09ae..ac3ee27d8f2 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java @@ -17,12 +17,14 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.anyObject; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java index fb65e5da4b4..d65f95e5629 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java index 845f607c308..dc5794c85da 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java @@ -17,9 +17,11 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java index 7bbe9bc1c12..d37738dfb15 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java index 6c5fed04910..54559688401 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java @@ -17,10 +17,12 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java index b54dc9ae4ee..2b3ed738dd7 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -32,6 +33,7 @@ import android.content.pm.PackageManager; import android.content.pm.UserInfo; import android.content.res.Resources; import android.os.UserHandle; + import androidx.preference.Preference; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java index 442b56caab9..eabd4bb7b6c 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.argThat; @@ -28,6 +29,7 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.UserInfo; import android.os.UserHandle; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java index 0ee50cafe56..9dd02dea413 100644 --- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java @@ -17,9 +17,11 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java index 14ae7b4277a..10e569a7a7e 100644 --- a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java @@ -17,9 +17,11 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java index c007d37375e..d62576065f5 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java @@ -17,9 +17,11 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java index 885e8901cff..421a99fa231 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java @@ -17,11 +17,13 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java index 2201e69e4a4..56d90f56c76 100644 --- a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java index 2736d5610a6..00eb3f96487 100644 --- a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java index 8c8113be4cd..73318214b40 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java @@ -17,6 +17,7 @@ package com.android.settings.fingerprint; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java index e83e93d9bc9..f054b57fcd3 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java @@ -17,6 +17,7 @@ package com.android.settings.fingerprint; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java index 74d4b28a1b7..5b7336fe7b9 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java @@ -17,6 +17,7 @@ package com.android.settings.fingerprint; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java index 01a3c1e1769..f1e2adcde6d 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java @@ -17,14 +17,16 @@ package com.android.settings.fingerprint; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.FrameLayout; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.fingerprint.FingerprintSettings.FingerprintPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java index 583428e6c0f..bf91578c9c3 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.fingerprint; import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java index 8e94be01b47..0e689e9e10b 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.fingerprint; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -29,6 +31,7 @@ import android.content.pm.PackageManager; import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; import android.os.UserManager; + import androidx.preference.Preference; import com.android.internal.widget.LockPatternUtils; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java index ee47f2a036c..fdd47921a1b 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java @@ -17,6 +17,7 @@ package com.android.settings.fingerprint; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.RuntimeEnvironment.application; import android.app.Activity; diff --git a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java index 9e62511d6b2..a5de0533b54 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java @@ -17,6 +17,7 @@ package com.android.settings.fingerprint; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.RuntimeEnvironment.application; import android.app.KeyguardManager; @@ -27,7 +28,8 @@ import android.view.View; import android.widget.Button; import com.android.settings.R; -import com.android.settings.fingerprint.SetupFingerprintEnrollIntroductionTest.ShadowStorageManagerWrapper; +import com.android.settings.fingerprint.SetupFingerprintEnrollIntroductionTest + .ShadowStorageManagerWrapper; import com.android.settings.password.SetupChooseLockGeneric.SetupChooseLockGenericFragment; import com.android.settings.password.SetupSkipDialog; import com.android.settings.password.StorageManagerWrapper; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java index da4bddbb0a8..2238821ac1a 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java @@ -17,7 +17,9 @@ package com.android.settings.fuelgauge; import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -41,6 +43,7 @@ import android.graphics.drawable.Drawable; import android.os.BatteryStats; import android.os.Bundle; import android.os.UserHandle; + import androidx.preference.Preference; import androidx.recyclerview.widget.RecyclerView; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java index 551cb3e0bb0..4221a70a80b 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java index e8e688d84dc..0b6051b7ee1 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.doReturn; import android.content.Context; import android.provider.Settings; + import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java index d5f3e2b58a7..f820e63e217 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doNothing; @@ -32,6 +33,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Build; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java index a30ddf1cfb7..3e2ebaf49b9 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java @@ -17,17 +17,19 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.PreferenceGroup; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.FeatureFlagUtils; import android.util.SparseArray; +import androidx.preference.PreferenceGroup; + import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsImpl; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java index 4583dd1b3b4..fb34640a803 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java @@ -18,6 +18,7 @@ package com.android.settings.fuelgauge; import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java index 30999cbcd00..085e4368620 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java index b89a3f0fd0e..fceee7ef67a 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java @@ -16,6 +16,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java index 8f94ffb6412..23742063708 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.fuelgauge; import static androidx.lifecycle.Lifecycle.Event.ON_START; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -28,14 +30,15 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.Intent; import android.os.BatteryManager; +import android.widget.TextView; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; import androidx.recyclerview.widget.RecyclerView; -import android.widget.TextView; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java index 0da118abc79..d0d3129a0f3 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java @@ -16,6 +16,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.spy; @@ -23,11 +24,12 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.graph.UsageView; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java index bebf31fabc7..dc5834ee9c0 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyLong; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java index 99967f78370..821089d4d49 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Matchers.anyLong; import static org.mockito.Mockito.any; @@ -41,7 +42,6 @@ import com.android.settings.testutils.BatteryTestUtils; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.R; -import com.android.settingslib.utils.PowerUtil; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java index bc91e17b204..b8232d41ed2 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java @@ -16,6 +16,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java index 66ea56c641b..329a70dcd79 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -25,8 +26,9 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.content.Intent; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java index 5913d6b56f6..d22dd7b7422 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java @@ -25,6 +25,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.PowerManager; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java index ac0b25a9646..43ea2262a4c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java @@ -20,7 +20,9 @@ import static android.os.BatteryStats.Uid.PROCESS_STATE_FOREGROUND; import static android.os.BatteryStats.Uid.PROCESS_STATE_FOREGROUND_SERVICE; import static android.os.BatteryStats.Uid.PROCESS_STATE_TOP; import static android.os.BatteryStats.Uid.PROCESS_STATE_TOP_SLEEPING; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; @@ -54,7 +56,6 @@ import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; import com.android.settings.fuelgauge.anomaly.Anomaly; import com.android.settings.fuelgauge.batterytip.AnomalyInfo; -import com.android.settings.fuelgauge.batterytip.StatsManagerConfig; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.fuelgauge.PowerWhitelistBackend; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java index 83d8f7a81f6..77b6ed7ef23 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java @@ -16,6 +16,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java index caaf71e28f6..140a426b7e8 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java @@ -20,12 +20,13 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.graphics.drawable.Drawable; import android.graphics.drawable.VectorDrawable; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java index ffa49d4f253..2f3cb7cf2a4 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java @@ -28,11 +28,12 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.Bundle; -import androidx.preference.PreferenceScreen; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java index f003a7678c5..960a7beab33 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java @@ -17,23 +17,26 @@ package com.android.settings.fuelgauge; import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import android.content.Intent; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; +import android.util.IconDrawableFactory; + import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; -import android.util.IconDrawableFactory; import com.android.settings.SettingsActivity; import com.android.settings.fuelgauge.anomaly.Anomaly; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java index 07341a14656..7d35ae3d9ae 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java @@ -18,6 +18,7 @@ package com.android.settings.fuelgauge; import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_ADVANCED_BATTERY; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; @@ -48,7 +49,6 @@ import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.applications.LayoutPreference; -import com.android.settings.dashboard.SummaryLoader; import com.android.settings.fuelgauge.anomaly.Anomaly; import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java index c6f885cc5bf..774ff071081 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java @@ -31,10 +31,10 @@ import android.content.Context; import android.content.Intent; import android.os.UserHandle; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.SettingsActivity; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.fuelgauge.batterytip.AppInfo; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java index c52377f172d..07435182fd6 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java @@ -30,12 +30,11 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.UserHandle; +import android.util.IconDrawableFactory; + import androidx.preference.CheckBoxPreference; -import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceManager; -import android.util.IconDrawableFactory; -import android.widget.CheckBox; import com.android.settings.SettingsActivity; import com.android.settings.core.InstrumentedPreferenceFragment; @@ -49,7 +48,6 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java index 163b7c5c43d..c70b23dfed5 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java @@ -23,6 +23,7 @@ import static org.mockito.Mockito.doReturn; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java index f209fd7ef71..b2e4122b4e1 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java index 831b07cb353..92b765a0745 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java index e2febc11bc7..41806127a60 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java index 873b512c66c..14d53e4db59 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.verify; @@ -25,6 +26,7 @@ import static org.mockito.Mockito.when; import android.app.FragmentManager; import android.app.FragmentTransaction; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java index 72abc18c490..6c11f0f679b 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import android.os.Build; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java index 20b5486db00..9e1e2418d7a 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly.action; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java index 49c679bb547..7516d56f169 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly.action; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java index f49395bdbc2..8a6ce6285da 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly.action; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java index 61cf694942d..16f7dc5498b 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly.checker; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyLong; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java index b70dcaff070..1e66b942d5d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly.checker; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java index 789b80b4c06..7792fbbbb46 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly.checker; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java index 89c5c0fa509..2bc5b14dd3f 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java @@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; + import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java index 9457f091dbe..4ff7a4f21a8 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java @@ -17,10 +17,11 @@ package com.android.settings.fuelgauge.batterysaver; import static com.google.common.truth.Truth.assertThat; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.provider.Settings; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.widget.SeekBarPreference; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java index 95c59904b3e..c09af2b817d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java @@ -17,15 +17,17 @@ package com.android.settings.fuelgauge.batterysaver; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; import android.os.PowerManager; -import androidx.preference.PreferenceScreen; import android.widget.Button; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.TwoStateButtonPreference; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java index 35b6531a5b3..8e7590bbb2e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java @@ -34,7 +34,6 @@ import android.app.StatsManager; import android.app.job.JobInfo; import android.app.job.JobScheduler; import android.content.Context; -import android.content.SharedPreferences; import android.provider.Settings; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java index b55bf6b956c..ab3a1df8ebe 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java @@ -52,14 +52,13 @@ import android.os.UserManager; import android.util.Pair; import com.android.internal.logging.nano.MetricsProto; -import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; -import com.android.settingslib.fuelgauge.PowerWhitelistBackend; import com.android.settings.testutils.shadow.ShadowPowerWhitelistBackend; +import com.android.settingslib.fuelgauge.PowerWhitelistBackend; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java index 4623c109555..4097e7cf6c4 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java @@ -23,6 +23,7 @@ import static org.mockito.Mockito.when; import android.app.AppOpsManager; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java index b0d6a7dce49..3a3291c7fb0 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java index ff52a0843ab..2dea0faf38b 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java @@ -21,7 +21,6 @@ import static com.android.settings.fuelgauge.batterytip.tips.BatteryTip.TipType import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -29,12 +28,13 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.Bundle; +import android.text.format.DateUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; -import android.text.format.DateUtils; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java index 459c4e2a03f..3882e8c0e85 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java index 836f458c752..0d6f9c55ba6 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java @@ -15,12 +15,9 @@ */ package com.android.settings.fuelgauge.batterytip.actions; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import android.app.AppOpsManager; -import android.content.Context; import android.util.Pair; import com.android.internal.logging.nano.MetricsProto; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java index 7fdf46a8f47..c44ae786bf3 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java @@ -15,8 +15,6 @@ */ package com.android.settings.fuelgauge.batterytip.actions; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import android.app.AppOpsManager; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java index c4c3d021b18..24284efdd22 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip.detectors; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java index d00cf875fa3..379d28f1e6c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java @@ -30,7 +30,6 @@ import android.text.format.DateUtils; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; -import com.android.settings.fuelgauge.BatteryInfo; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java index 42d88224628..f10ea7ee601 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip.detectors; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.ContentResolver; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java index df38d34d48b..27cb04b3072 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip.detectors; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.text.format.DateUtils; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java index fa81300bcb6..371bfb45796 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java @@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.IdRes; import androidx.preference.Preference; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java index 359d2601f81..fe721133aea 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java @@ -23,7 +23,6 @@ import android.content.Context; import android.os.Parcel; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java index e2c80df9a1f..825cfc07769 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java @@ -35,7 +35,6 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java index bd96f0f4ba0..1c5fafcde34 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.ContentResolver; diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java index 9793f7d1576..9946361baff 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java index 8c0be96d26b..0181d78b570 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java @@ -24,15 +24,12 @@ import static com.android.settings.gestures.DoubleTapPowerPreferenceController.i import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.when; - import android.content.ContentResolver; import android.content.Context; import android.content.SharedPreferences; import android.provider.Settings; import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl; -import com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController; import com.android.settings.search.InlinePayload; import com.android.settings.search.InlineSwitchPayload; import com.android.settings.search.ResultPayload; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java index efc9f4fe8fe..d373dc4803f 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java @@ -21,6 +21,7 @@ import static com.android.settings.core.BasePreferenceController.DISABLED_DEPEND import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java index 0ec5ae1d5b1..0fce4630076 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java index 493e643f496..7d1eab37864 100644 --- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java @@ -18,8 +18,6 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; -import static junit.framework.Assert.assertEquals; - import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; @@ -28,6 +26,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.Bundle; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java index 29d2c19e149..db8064ae3ac 100644 --- a/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java @@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.CategoryKey; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java index adee6097fa1..d8f800d520b 100644 --- a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -25,6 +26,7 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java index f609373aa79..706f3ce5934 100644 --- a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java @@ -21,6 +21,7 @@ import static com.android.settings.core.BasePreferenceController.DISABLED_DEPEND import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java index 833a09d59b0..c2ed06f29cb 100644 --- a/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java @@ -19,32 +19,22 @@ package com.android.settings.gestures; import static android.provider.Settings.Secure.VOLUME_HUSH_GESTURE; import static android.provider.Settings.Secure.VOLUME_HUSH_MUTE; import static android.provider.Settings.Secure.VOLUME_HUSH_OFF; -import static android.provider.Settings.Secure.VOLUME_HUSH_VIBRATE; import static com.google.common.truth.Truth.assertThat; import static junit.framework.Assert.assertEquals; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.content.ContentResolver; import android.content.Context; -import android.content.SharedPreferences; import android.provider.Settings; + import androidx.preference.ListPreference; import androidx.preference.Preference; -import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; -import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl; -import com.android.settings.search.InlinePayload; -import com.android.settings.search.InlineSwitchPayload; -import com.android.settings.search.ResultPayload; import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -53,7 +43,6 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.RuntimeEnvironment; @RunWith(SettingsRobolectricTestRunner.class) public class PreventRingingPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java index 8522229b8eb..fefff22bff0 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.gestures; import static android.provider.Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java index a001a4a36a9..b140b52411c 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java @@ -17,15 +17,11 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.ResolveInfo; -import android.os.UserManager; -import android.provider.Settings; import com.android.internal.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -35,8 +31,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; diff --git a/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java b/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java index 788d130d3d8..5ba64c32748 100644 --- a/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java +++ b/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java @@ -18,6 +18,7 @@ package com.android.settings.graph; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java index e5ecd6d2423..b672e58967f 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java @@ -19,7 +19,9 @@ package com.android.settings.inputmethod; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java index ca23fa5e8ce..938171d5367 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.inputmethod; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -24,9 +25,10 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.hardware.input.InputManager; -import androidx.preference.Preference; import android.view.InputDevice; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowInputDevice; diff --git a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java index 11b3c4bdff0..5a1a93b8858 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java @@ -17,15 +17,17 @@ package com.android.settings.inputmethod; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; -import androidx.preference.Preference; import android.view.textservice.SpellCheckerInfo; import android.view.textservice.TextServicesManager; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java index c1a963cc678..0c1e44e7cc3 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.inputmethod; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -28,11 +29,12 @@ import android.app.admin.DevicePolicyManager; import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; -import androidx.core.text.BidiFormatter; -import androidx.preference.Preference; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; +import androidx.core.text.BidiFormatter; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java index 9e18e06d220..954fd5c622a 100644 --- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java +++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.language; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -27,7 +28,6 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.app.admin.DevicePolicyManager; -import androidx.lifecycle.LifecycleObserver; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; @@ -41,6 +41,8 @@ import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; import android.view.textservice.TextServicesManager; +import androidx.lifecycle.LifecycleObserver; + import com.android.settings.R; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java index 8b7e8a6db27..83b29fcdb62 100644 --- a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java @@ -17,12 +17,14 @@ package com.android.settings.language; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.AssetManager; + import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java b/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java index 9d42088a6db..8101d404b42 100644 --- a/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.language; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java index 1b07f404e51..76b76f5944d 100644 --- a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.language; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -24,6 +25,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.speech.tts.TextToSpeech; import android.speech.tts.TtsEngines; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java index c20a83e8c6b..9451092b0a3 100644 --- a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java @@ -19,6 +19,7 @@ package com.android.settings.language; import static com.google.common.truth.Truth.assertThat; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.inputmethod.UserDictionaryList; diff --git a/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java index 0e5a9f6ad71..6903bcd0c98 100644 --- a/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java @@ -16,12 +16,14 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.provider.Settings; import android.provider.Settings.Global; + import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/location/InjectedSettingTest.java b/tests/robotests/src/com/android/settings/location/InjectedSettingTest.java index fb999582e49..504583773a2 100644 --- a/tests/robotests/src/com/android/settings/location/InjectedSettingTest.java +++ b/tests/robotests/src/com/android/settings/location/InjectedSettingTest.java @@ -19,6 +19,7 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; import com.android.settings.testutils.SettingsRobolectricTestRunner; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java index 10a313f65ef..3302d2aae7b 100644 --- a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java @@ -16,7 +16,9 @@ package com.android.settings.location; import static android.Manifest.permission.WRITE_SECURE_SETTINGS; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; @@ -30,7 +32,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.ActivityManager; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.Intent; import android.content.pm.UserInfo; @@ -40,6 +41,8 @@ import android.os.UserManager; import android.provider.Settings; import android.text.TextUtils; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java index 727e9a7e9bd..00d8adb2acd 100644 --- a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doNothing; @@ -25,7 +26,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -37,6 +37,8 @@ import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.location.LocationManager; import android.os.Bundle; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; diff --git a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java index 92fbeb9bf99..58874be9a30 100644 --- a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; @@ -24,12 +25,13 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java index e96dd2fe96b..66ea3be3f6b 100644 --- a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java @@ -17,13 +17,14 @@ package com.android.settings.location; import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; @@ -32,6 +33,8 @@ import android.content.IntentFilter; import android.location.LocationManager; import android.provider.Settings; import android.provider.Settings.Secure; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java index f3958f41d59..9556b617ae4 100644 --- a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -25,12 +26,13 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; -import androidx.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.Context; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; @@ -40,9 +42,6 @@ import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.widget.RestrictedAppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; -import java.util.ArrayList; -import java.util.List; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -52,6 +51,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import java.util.ArrayList; +import java.util.List; + @RunWith(SettingsRobolectricTestRunner.class) @Config( shadows = { diff --git a/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java b/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java index 5e8180edced..65b2e878d6a 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java @@ -8,7 +8,14 @@ import static org.mockito.Mockito.spy; import android.content.Context; import android.content.res.Resources; + import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.widget.SliceLiveData; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -21,13 +28,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.List; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.widget.SliceLiveData; - @RunWith(SettingsRobolectricTestRunner.class) public class LocationSliceBuilderTest { diff --git a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java index bd36cfaebcc..475cb831544 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java @@ -22,10 +22,11 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.provider.Settings; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.ToggleSwitch; diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java index 9a69ad76a10..3d3dd28aa61 100644 --- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java @@ -16,7 +16,9 @@ package com.android.settings.location; import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.eq; @@ -27,14 +29,16 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.Intent; import android.provider.Settings; +import android.text.TextUtils; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; + import com.android.settings.R; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -42,8 +46,7 @@ import com.android.settings.widget.AppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; import com.android.settingslib.location.RecentLocationApps.Request; -import java.util.ArrayList; -import java.util.List; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -55,6 +58,9 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import java.util.ArrayList; +import java.util.List; + @RunWith(SettingsRobolectricTestRunner.class) public class RecentLocationRequestPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java index 1614a6cc808..a012c51c591 100644 --- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java @@ -24,9 +24,10 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.provider.Settings.Secure; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java index 6279adfc783..fa0b64958a6 100644 --- a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java @@ -16,12 +16,14 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.provider.Settings; import android.provider.Settings.Global; + import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java index 2bdad8287a2..91a545c595d 100644 --- a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java @@ -17,24 +17,26 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.ContentResolver; import android.content.Context; import android.content.pm.PackageManager; import android.provider.Settings; import android.provider.SettingsSlicesContract; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.RestrictedSwitchPreference; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java index e81bd821c44..09d1269f801 100644 --- a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java +++ b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java @@ -32,15 +32,16 @@ import android.content.Context; import android.content.res.Resources; import android.database.Cursor; import android.net.Uri; -import androidx.preference.MultiSelectListPreference; -import androidx.preference.SwitchPreference; -import androidx.preference.EditTextPreference; -import androidx.preference.ListPreference; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; import android.view.View; +import androidx.preference.EditTextPreference; +import androidx.preference.ListPreference; +import androidx.preference.MultiSelectListPreference; +import androidx.preference.SwitchPreference; + import com.android.settings.R; import com.android.settings.network.ApnEditor.ApnData; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java index 11eea6dc21d..f27368e242b 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.network; import static androidx.lifecycle.Lifecycle.Event.ON_START; import static androidx.lifecycle.Lifecycle.Event.ON_STOP; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -25,17 +27,18 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.robolectric.shadow.api.Shadow.extract; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.net.ConnectivityManager; import android.os.UserManager; import android.provider.Settings; import android.provider.Settings.Global; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import com.android.settings.testutils.shadow.ShadowUserManager; diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java index 06e334af886..6ef798b87f7 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java @@ -16,7 +16,7 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.nullable; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -25,7 +25,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.SearchIndexableResource; -import android.view.Menu; import com.android.settings.R; import com.android.settings.dashboard.SummaryLoader; @@ -38,7 +37,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.util.ReflectionHelpers; import java.util.List; diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java index 3a1833b2baf..8b0fe98568d 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java index 92994e01ee3..35431a09215 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java @@ -17,6 +17,7 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java index f6e40245177..7b940456c05 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -25,6 +26,7 @@ import android.content.ComponentName; import android.content.Context; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java index 8a47a80c271..83fa55cfe0a 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java @@ -16,6 +16,7 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; @@ -28,6 +29,7 @@ import android.content.ComponentName; import android.content.Context; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; + import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java index 72f36c66989..76e7bcbf29b 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java @@ -20,15 +20,14 @@ 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.provider.Settings.Global.PRIVATE_DNS_MODE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.anyInt; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.app.AlertDialog; -import android.app.Fragment; import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; @@ -40,16 +39,16 @@ import android.widget.Button; import android.widget.LinearLayout; import com.android.settings.R; -import com.android.settingslib.CustomDialogPreference.CustomPreferenceDialogFragment; -import com.android.settings.testutils.shadow.ShadowOs; import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.testutils.shadow.ShadowOs; +import com.android.settingslib.CustomDialogPreference.CustomPreferenceDialogFragment; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java index eff20d34857..0e308b2a059 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java @@ -16,17 +16,19 @@ package com.android.settings.network; -import static androidx.lifecycle.Lifecycle.Event.ON_START; -import static androidx.lifecycle.Lifecycle.Event.ON_STOP; 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.provider.Settings.Global.PRIVATE_DNS_DEFAULT_MODE; import static android.provider.Settings.Global.PRIVATE_DNS_MODE; import static android.provider.Settings.Global.PRIVATE_DNS_SPECIFIER; + +import static androidx.lifecycle.Lifecycle.Event.ON_START; +import static androidx.lifecycle.Lifecycle.Event.ON_STOP; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.CALLS_REAL_METHODS; import static org.mockito.Mockito.atLeastOnce; @@ -34,21 +36,20 @@ import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.withSettings; import static org.mockito.Mockito.when; +import static org.mockito.Mockito.withSettings; -import androidx.lifecycle.LifecycleOwner; -import android.content.Context; import android.content.ContentResolver; -import android.database.ContentObserver; +import android.content.Context; import android.net.ConnectivityManager; import android.net.ConnectivityManager.NetworkCallback; import android.net.LinkProperties; import android.net.Network; import android.os.Handler; import android.provider.Settings; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; @@ -66,7 +67,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowContentResolver; -import org.robolectric.shadows.ShadowServiceManager; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java index 5bf675e91b0..e800cdd7638 100644 --- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java @@ -34,6 +34,7 @@ import android.content.IntentFilter; import android.database.ContentObserver; import android.net.ConnectivityManager; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java index 0455d9fbdfa..11541ed2ab2 100644 --- a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java @@ -16,9 +16,11 @@ package com.android.settings.network; -import static com.google.common.truth.Truth.assertThat; import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + +import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; @@ -26,7 +28,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.net.ConnectivityManager; import android.net.IConnectivityManager; @@ -34,6 +35,8 @@ import android.net.NetworkRequest; import android.os.IBinder; import android.os.UserHandle; import android.provider.SettingsSlicesContract; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java index 0abd428d027..e3fc843a9b0 100644 --- a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java @@ -27,6 +27,7 @@ import android.nfc.NfcManager; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java b/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java index 9e7e4f4df08..5efa94aaa98 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java @@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.nfc.NfcAdapter; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.SwitchPreference; diff --git a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java index 4d40b122368..7938ad11c7e 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java @@ -17,12 +17,14 @@ package com.android.settings.nfc; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java index f65866a4a00..026f392a5f3 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java @@ -27,6 +27,7 @@ import android.nfc.NfcAdapter; import android.nfc.NfcManager; import android.os.UserManager; import android.provider.Settings; + import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java index 6feed46dc12..d57993262f5 100644 --- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java +++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java @@ -18,6 +18,7 @@ package com.android.settings.nfc; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java index 2f383fe3c60..6537a405c76 100644 --- a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doCallRealMethod; @@ -27,6 +28,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.accounts.AccountRestrictionHelper; diff --git a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java index 4f48b779b6c..517c94b9fe7 100644 --- a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java index d89897282f2..a9df13569e2 100644 --- a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java @@ -20,8 +20,10 @@ import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -35,6 +37,7 @@ import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java index 84407eb2acc..83c0b06b8ac 100644 --- a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java @@ -19,8 +19,10 @@ package com.android.settings.notification; import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -31,6 +33,7 @@ import android.app.NotificationManager; import android.content.Context; import android.content.Intent; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java index 96dbd623a78..dc368a254b6 100644 --- a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java @@ -21,8 +21,10 @@ import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.provider.Settings.Secure.NOTIFICATION_BADGING; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -37,6 +39,7 @@ import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java index 68991246ae1..2a404d6e888 100644 --- a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java @@ -22,6 +22,7 @@ import static com.android.settings.notification.BadgingNotificationPreferenceCon import static com.android.settings.notification.BadgingNotificationPreferenceController.ON; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,6 +30,7 @@ import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java index a13946e775e..c77fbad34a9 100644 --- a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java @@ -22,9 +22,11 @@ import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; diff --git a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java index f2e50e9f6fc..0aa94c7c1ab 100644 --- a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java index f20409a6abd..c3c0a33b0ef 100644 --- a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java @@ -21,7 +21,6 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_ import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java index 894ec07a8d5..ceffe28e852 100644 --- a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -25,8 +26,9 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java index 5f3a616a273..4f813bd963b 100644 --- a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; @@ -30,6 +31,7 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java index 8901a5df17c..0d82fcb6089 100644 --- a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java @@ -18,8 +18,10 @@ package com.android.settings.notification; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -30,6 +32,7 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java index 881a307c88c..84ed1345e2a 100644 --- a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -24,10 +25,11 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.System; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import android.telephony.TelephonyManager; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java index 9f90e268961..e086e7fc64f 100644 --- a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java @@ -17,12 +17,13 @@ package com.android.settings.notification; import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; -import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_MIN; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -35,13 +36,13 @@ import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; -import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java index 74ace1dd764..451b78548a2 100644 --- a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; @@ -26,6 +27,7 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; + import androidx.preference.DropDownPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java index 3afb343f906..ade8bce631d 100644 --- a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -25,8 +26,9 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java index 93273c86275..ef382111ce2 100644 --- a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.eq; diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java index 0dba467779b..36b98845305 100644 --- a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -24,9 +25,10 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; +import android.telephony.TelephonyManager; + import androidx.preference.DropDownPreference; import androidx.preference.PreferenceScreen; -import android.telephony.TelephonyManager; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java index 26f516508bc..cc35f602797 100644 --- a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java @@ -17,8 +17,10 @@ package com.android.settings.notification; import static android.app.NotificationManager.IMPORTANCE_NONE; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -31,9 +33,10 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; -import androidx.preference.PreferenceFragment; import android.view.View; +import androidx.preference.PreferenceFragment; + import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java index 5557cfd6dfd..0c706fbdaaf 100644 --- a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java @@ -20,10 +20,12 @@ import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; + import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -34,9 +36,10 @@ import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.RestrictedListPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java index 02b85e11cae..c2768259a32 100644 --- a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java @@ -21,8 +21,10 @@ import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -36,6 +38,7 @@ import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java index 0d493150f3c..af810ace478 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java @@ -17,17 +17,19 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.Switch; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java index 7eeee98982c..c897fb54706 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java @@ -22,8 +22,10 @@ import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_MIN; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.any; @@ -37,6 +39,7 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java index 9d805e8785d..cd3fad71628 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java index e429f9a2928..65c60c7222b 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.notification; import static android.app.NotificationManager.IMPORTANCE_NONE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -27,6 +29,7 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java index 98cbc76dc58..7a98386ea24 100644 --- a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java index 119f5835bba..1cd98477238 100644 --- a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java @@ -17,13 +17,16 @@ package com.android.settings.notification; import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java index 9dd077f092f..71bc15c6982 100644 --- a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -40,10 +41,11 @@ import android.content.pm.ResolveInfo; import android.os.UserHandle; import android.os.UserManager; import android.service.notification.NotifyingApp; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java index 65bc7e6c40e..50a01bc89dc 100644 --- a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.app.NotificationManager; diff --git a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java index c6b055b04b9..3bd32927895 100644 --- a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java @@ -17,12 +17,14 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; import android.media.RingtoneManager; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java index 4e91eafe2fe..a1c6d99b4c1 100644 --- a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -25,8 +26,9 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.System; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java index 38e91a4c9a6..5b43508f2d2 100644 --- a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_GLOBAL; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -27,6 +29,7 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; + import androidx.preference.PreferenceScreen; import com.android.settings.SettingsPreferenceFragment; diff --git a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java index b98a68fadf3..3fc563a3a8e 100644 --- a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java @@ -20,8 +20,10 @@ import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -40,9 +42,10 @@ import android.content.Intent; import android.net.Uri; import android.os.UserManager; import android.provider.Settings; +import android.util.AttributeSet; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.AttributeSet; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java index 4eef4b626fb..3510a60eb1f 100644 --- a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -26,8 +27,8 @@ import android.content.Context; import android.media.AudioManager; import android.os.Handler; import android.os.UserManager; - import android.preference.SeekBarVolumizer; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; diff --git a/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java b/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java index 622d5cd8967..9bb380df01e 100644 --- a/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java +++ b/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java @@ -16,6 +16,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.ComponentName; diff --git a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java index 8dd8f2453ba..6c77b10909b 100644 --- a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -26,8 +27,9 @@ import android.content.ContentResolver; import android.content.Context; import android.media.AudioManager; import android.provider.Settings.System; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java index c391c1344ba..8c0bb456a4d 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -25,8 +26,9 @@ import android.content.ContentResolver; import android.content.Context; import android.os.Vibrator; import android.provider.Settings.System; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java index 82357d8f6bc..aa1824d7d53 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java @@ -30,10 +30,11 @@ import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; +import android.telephony.TelephonyManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; -import android.telephony.TelephonyManager; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java index ce908952a86..69438e221ec 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java @@ -20,8 +20,10 @@ import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -35,6 +37,7 @@ import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; import android.os.Vibrator; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java index e37c852277f..b9f9021e74c 100644 --- a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java @@ -23,8 +23,10 @@ import static android.app.NotificationManager.IMPORTANCE_MIN; import static android.app.NotificationManager.VISIBILITY_NO_OVERRIDE; import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS; import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java index 7b9af3e9a34..99a97c342e2 100644 --- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -25,6 +26,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java index eb6adfc71e9..4397e71c653 100644 --- a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -28,11 +29,12 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserHandle; import android.os.UserManager; +import android.telephony.TelephonyManager; + import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; -import android.telephony.TelephonyManager; import com.android.settings.DefaultRingtonePreference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java index 40dfc4105e7..c679205ee1e 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java @@ -22,18 +22,14 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; -import android.widget.LinearLayout; import android.widget.RadioButton; -import android.widget.Switch; + +import androidx.preference.PreferenceViewHolder; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.widget.MasterSwitchPreference; -import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java index 8c7c32608cb..81ed5ef0bd4 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java @@ -34,6 +34,7 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; + import androidx.preference.PreferenceScreen; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java index 4325594ebcf..7caccf2d2fc 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -28,8 +29,9 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java index 552361a5784..2dd286d82df 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static junit.framework.Assert.assertEquals; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -25,6 +26,7 @@ import android.app.Fragment; import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; + import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java index b3a4b90b098..f1f1b2ea488 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java index 0bf82144260..4170ee89f19 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java @@ -21,11 +21,10 @@ import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_OFF; + import static junit.framework.Assert.assertTrue; -import static org.junit.Assert.assertFalse; -import static org.mockito.Mockito.any; + import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -37,9 +36,10 @@ import android.content.Context; import android.provider.Settings; import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig.ZenRule; +import android.util.ArrayMap; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.ArrayMap; import com.android.settings.R; import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java index e30fc71eff1..11cdfcc2697 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java index d3fab8fdf26..c854e8ad357 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java index 10bd641cfd1..320b5f91d09 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java @@ -21,6 +21,7 @@ import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_OFF; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,11 +31,12 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.view.View; import android.widget.Button; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java index 8ecc9551feb..3093b6a0c0f 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java @@ -29,6 +29,7 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java index c03e95b672e..5c55765942e 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java @@ -25,6 +25,7 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; @@ -38,7 +39,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java index c0f6768bc68..7d5efa7c065 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -28,8 +29,9 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java index 870981468e4..f5eca34bf62 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -28,8 +29,9 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java index dd4b408e525..37ffd786118 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -28,6 +29,7 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java index 3ea4471fadc..aaa4d0ed306 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -27,6 +28,7 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.app.NotificationManager.Policy; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java index 2e7f35cbf59..4ddb5fca455 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -28,8 +29,9 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java index cb79d649f89..4518427ad6c 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -28,8 +29,9 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java index 23b242a2fa0..559ba72ec71 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java index fcf54ead814..b6efd78dda7 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java @@ -21,7 +21,9 @@ import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_OFF; + import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertFalse; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -36,9 +38,10 @@ import android.net.Uri; import android.provider.Settings; import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig.ZenRule; +import android.util.ArrayMap; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.ArrayMap; import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java index 39e9271fa2f..96e56582995 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static junit.framework.Assert.assertEquals; import android.app.NotificationManager; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java index e3ba8033922..bfc5c428f05 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java @@ -29,7 +29,13 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.provider.Settings; -import androidx.core.graphics.drawable.IconCompat; + +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.widget.SliceLiveData; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -44,13 +50,6 @@ import org.robolectric.annotation.Config; import java.util.List; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.widget.SliceLiveData; - @Config(shadows = ShadowNotificationManager.class) @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeSliceBuilderTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java index 754e66dbfff..3926a45d96e 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java @@ -29,6 +29,7 @@ import android.app.NotificationManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java index 54d6afec612..418af7880b3 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java @@ -21,8 +21,6 @@ import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; -import static junit.framework.Assert.assertEquals; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -31,8 +29,9 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -42,9 +41,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; -import org.robolectric.shadows.ShadowApplication; import org.robolectric.RuntimeEnvironment; +import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java index 2fb747e4b88..71720bfaffe 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java @@ -21,10 +21,8 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_LIGHTS; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_NOTIFICATION_LIST; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; @@ -36,13 +34,13 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; import android.content.res.Resources; -import androidx.preference.CheckBoxPreference; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settings.widget.DisabledCheckBoxPreference; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java index a20b7e16d14..3cada1ed793 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java @@ -30,23 +30,18 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent .ACTION_ZEN_SOUND_AND_VIS_EFFECTS; import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.widget.DisabledCheckBoxPreference; -import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java index 9f8e91ac7a4..f3658823a43 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java @@ -26,21 +26,16 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OF import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR; -import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_ZEN_CUSTOM; -import static com.android.internal.logging.nano.MetricsProto.MetricsEvent - .ACTION_ZEN_SOUND_AND_VIS_EFFECTS; - import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java index fd22166563b..08384af610a 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java @@ -29,23 +29,19 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BA import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_ZEN_SOUND_ONLY; import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.widget.DisabledCheckBoxPreference; -import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java index 609b3a5ce87..87cb781170f 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java index 75b6bb4b14a..3a05e77eb68 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java @@ -17,6 +17,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.RuntimeEnvironment.application; import android.app.admin.DevicePolicyManager; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java index e07351cd34a..575f08c699d 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java @@ -17,6 +17,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.RuntimeEnvironment.application; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java index 2a8c406551b..5d51178b65c 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java @@ -1,6 +1,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java index 9d72bd883da..836311757c4 100644 --- a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java +++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java @@ -17,6 +17,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.Shadows.shadowOf; import android.content.ComponentName; diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java index b5572574d68..a15fc2f6d0b 100644 --- a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java +++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.password; import static android.content.pm.PackageManager.FEATURE_FINGERPRINT; + import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment .HIDE_DISABLED_PREFS; import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment @@ -24,7 +25,9 @@ import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericF import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE; import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT; import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE; + import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java index cef18741401..ded379b5358 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java @@ -17,6 +17,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.RuntimeEnvironment.application; import static org.robolectric.Shadows.shadowOf; diff --git a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java index 1b48da80c51..51988ff975e 100644 --- a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java @@ -18,13 +18,14 @@ package com.android.settings.print; import static androidx.lifecycle.Lifecycle.Event.ON_START; import static androidx.lifecycle.Lifecycle.Event.ON_STOP; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.UserManager; import android.print.PrintJob; @@ -32,6 +33,8 @@ import android.print.PrintJobInfo; import android.print.PrintManager; import android.printservice.PrintServiceInfo; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; diff --git a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java index df60654c1f0..27f902a2baa 100644 --- a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java +++ b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java @@ -17,6 +17,7 @@ package com.android.settings.search; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java index e99b0ea4aaa..ff82fa32f15 100644 --- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java +++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java @@ -18,6 +18,7 @@ package com.android.settings.search; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java b/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java index 1c02b99323d..43ce96611d0 100644 --- a/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java @@ -16,7 +16,6 @@ package com.android.settings.search; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -30,6 +29,10 @@ import android.app.Activity; import android.content.ContentResolver; import android.net.Uri; +import androidx.slice.Slice; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceViewManager; + import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,17 +40,11 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; import org.robolectric.Robolectric; import java.util.ArrayList; import java.util.List; -import androidx.slice.Slice; -import androidx.slice.SliceViewManager; -import androidx.slice.SliceMetadata; - @RunWith(SettingsRobolectricTestRunner.class) public class DeviceIndexUpdateJobServiceTest { private static final Uri BASE_URI = new Uri.Builder() diff --git a/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java b/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java index cbd68c04712..ffa04ecb8dd 100644 --- a/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java +++ b/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java @@ -1,6 +1,7 @@ package com.android.settings.search; import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE; + import static com.google.common.truth.Truth.assertThat; import android.content.ContentResolver; diff --git a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java index eb6ad6e970c..add0a90202f 100644 --- a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java +++ b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java @@ -18,6 +18,7 @@ package com.android.settings.search; import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE; + import static com.google.common.truth.Truth.assertThat; import android.content.ContentResolver; diff --git a/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java index 38d90e4cfd1..974bee07e95 100644 --- a/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java +++ b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java @@ -18,6 +18,7 @@ package com.android.settings.search; import static com.google.common.truth.Truth.assertThat; + import static junit.framework.Assert.fail; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java index eeebdee96e3..eddffba82e9 100644 --- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java @@ -18,6 +18,7 @@ package com.android.settings.search; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.app.Activity; diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java index eff95fe327f..36a0dc9f8aa 100644 --- a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java @@ -17,8 +17,11 @@ package com.android.settings.search; import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE; + import static com.google.common.truth.Truth.assertThat; + import static junit.framework.Assert.fail; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java index f6e14735b37..89d3ac0fe4a 100644 --- a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java +++ b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java @@ -1,6 +1,7 @@ package com.android.settings.search; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/search/indexing/IndexDataConverterTest.java b/tests/robotests/src/com/android/settings/search/indexing/IndexDataConverterTest.java index 620cb0c0ed9..8d29898aabe 100644 --- a/tests/robotests/src/com/android/settings/search/indexing/IndexDataConverterTest.java +++ b/tests/robotests/src/com/android/settings/search/indexing/IndexDataConverterTest.java @@ -17,6 +17,10 @@ package com.android.settings.search.indexing; +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.spy; + import android.content.Context; import android.provider.SearchIndexableResource; import android.text.TextUtils; @@ -40,10 +44,6 @@ import java.util.List; import java.util.Locale; import java.util.Set; -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.Mockito.spy; - @RunWith(SettingsRobolectricTestRunner.class) @Config(qualifiers = "mcc999") public class IndexDataConverterTest { diff --git a/tests/robotests/src/com/android/settings/search/indexing/PreIndexDataCollectorTest.java b/tests/robotests/src/com/android/settings/search/indexing/PreIndexDataCollectorTest.java index 18f05b69429..cb78e8c2fd4 100644 --- a/tests/robotests/src/com/android/settings/search/indexing/PreIndexDataCollectorTest.java +++ b/tests/robotests/src/com/android/settings/search/indexing/PreIndexDataCollectorTest.java @@ -18,6 +18,7 @@ package com.android.settings.search.indexing; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java index 6cc1704bf39..18375908a32 100644 --- a/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java index 493c166b14e..ebe420512be 100644 --- a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java @@ -19,6 +19,7 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java b/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java index 6e49f1e3949..45555755255 100644 --- a/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java +++ b/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java @@ -17,7 +17,9 @@ package com.android.settings.security; import static com.android.settings.security.EncryptionAndCredential.SEARCH_INDEX_DATA_PROVIDER; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; diff --git a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java index 944f9fd4e60..ee9fb16d1fa 100644 --- a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java @@ -16,12 +16,16 @@ 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_SECURITY_PAGE; +import static com.android.settings.security.EncryptionStatusPreferenceController + .PREF_KEY_ENCRYPTION_DETAIL_PAGE; +import static com.android.settings.security.EncryptionStatusPreferenceController + .PREF_KEY_ENCRYPTION_SECURITY_PAGE; + import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java index 728fda65ab2..fb6503eaccc 100644 --- a/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java @@ -17,12 +17,14 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserHandle; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java index 3feb4a92525..cf8bc14a71e 100644 --- a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java @@ -16,12 +16,14 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; + import androidx.preference.SwitchPreference; import com.android.internal.widget.LockPatternUtils; diff --git a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java index 5568553b7c9..6533ae48887 100644 --- a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -29,6 +30,7 @@ import static org.mockito.Mockito.when; import android.app.FragmentManager; import android.app.FragmentTransaction; import android.content.Context; + import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java index b41ec461a08..6bd5e1fc34d 100644 --- a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java @@ -18,10 +18,11 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.UserManager; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java index e8906cba15e..1851ed52afb 100644 --- a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java @@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java index 5928587798d..6b968e6f195 100644 --- a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,6 +25,7 @@ import android.content.ContentResolver; import android.content.Context; import android.os.UserHandle; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java index 4a12c5a2397..f20587db2ea 100644 --- a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.security; import static android.telephony.TelephonyManager.SIM_STATE_READY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -25,13 +27,14 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.PersistableBundle; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java index 1d65aed2015..08fdd7d5e51 100644 --- a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java @@ -19,19 +19,23 @@ package com.android.settings.security; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; + import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.PackageManager; import android.hardware.fingerprint.FingerprintManager; import android.os.UserManager; +import androidx.lifecycle.LifecycleOwner; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java index 2a4b335cfa3..0c7f3853442 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.security.screenlock; import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java index fc555c4502a..6348bf2b9b8 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java @@ -18,17 +18,22 @@ package com.android.settings.security.screenlock; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; + import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.UserManager; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java index 0b5d29d9284..9d7a5071bf4 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java @@ -17,11 +17,13 @@ package com.android.settings.security.screenlock; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; import android.content.Context; + import androidx.preference.SwitchPreference; import com.android.internal.widget.LockPatternUtils; diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java index c30c53ebb88..028145584d1 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java @@ -17,11 +17,13 @@ package com.android.settings.security.screenlock; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; import android.content.Context; + import androidx.preference.SwitchPreference; import com.android.internal.widget.LockPatternUtils; diff --git a/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java b/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java index c1d7dd24791..6d378ef3d89 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.security.screenlock; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java index eedb2da4c07..07269bf6448 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java @@ -17,10 +17,12 @@ package com.android.settings.security.trustagent; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.internal.widget.LockPatternUtils; diff --git a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java index 94298be696d..d8ace148292 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java @@ -16,9 +16,13 @@ package com.android.settings.security.trustagent; -import static com.android.settings.security.trustagent.TrustAgentListPreferenceController.PREF_KEY_SECURITY_CATEGORY; -import static com.android.settings.security.trustagent.TrustAgentListPreferenceController.PREF_KEY_TRUST_AGENT; +import static com.android.settings.security.trustagent.TrustAgentListPreferenceController + .PREF_KEY_SECURITY_CATEGORY; +import static com.android.settings.security.trustagent.TrustAgentListPreferenceController + .PREF_KEY_TRUST_AGENT; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; @@ -27,9 +31,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; -import androidx.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.Context; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java index 9cee3d1f119..668734e14d2 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java @@ -17,6 +17,7 @@ package com.android.settings.security.trustagent; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.pm.PackageManager; diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java index 21bef6131c9..f139720c90c 100644 --- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java +++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java @@ -18,7 +18,9 @@ package com.android.settings.slices; import static android.content.ContentResolver.SCHEME_CONTENT; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -36,6 +38,8 @@ import android.os.StrictMode; import android.provider.SettingsSlicesContract; import android.util.ArraySet; +import androidx.slice.Slice; + import com.android.settings.bluetooth.BluetoothSliceBuilder; import com.android.settings.location.LocationSliceBuilder; import com.android.settings.notification.ZenModeSliceBuilder; @@ -63,8 +67,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import androidx.slice.Slice; - /** * TODO Investigate using ShadowContentResolver.registerProviderInternal(String, ContentProvider) */ diff --git a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java index 25f0d0cb163..1353bc714c8 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java @@ -19,7 +19,6 @@ package com.android.settings.slices; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -40,11 +39,11 @@ import android.util.Pair; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.FakeIndexProvider; import com.android.settings.search.SearchFeatureProvider; import com.android.settings.search.SearchFeatureProviderImpl; import com.android.settings.testutils.DatabaseTestUtils; import com.android.settings.testutils.FakeFeatureFactory; +import com.android.settings.testutils.FakeIndexProvider; import com.android.settings.testutils.FakeSliderController; import com.android.settings.testutils.FakeToggleController; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java index 96e475e9fbe..24979085cf6 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import android.app.PendingIntent; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; @@ -34,6 +33,10 @@ import android.provider.Settings; import android.provider.SettingsSlicesContract; import android.util.Pair; +import androidx.slice.Slice; +import androidx.slice.SliceProvider; +import androidx.slice.widget.SliceLiveData; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; @@ -50,10 +53,6 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.robolectric.RuntimeEnvironment; -import androidx.slice.Slice; -import androidx.slice.SliceProvider; -import androidx.slice.widget.SliceLiveData; - @RunWith(SettingsRobolectricTestRunner.class) public class SliceBuilderUtilsTest { diff --git a/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java b/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java index 9c8b9462c92..213de11bf56 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java +++ b/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java @@ -17,6 +17,7 @@ package com.android.settings.slices; import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_CONTROLLER; + import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java index 674d6299a1e..a7df5a74028 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java @@ -33,10 +33,10 @@ import android.text.TextUtils; import com.android.settings.R; import com.android.settings.accessibility.AccessibilitySettings; import com.android.settings.accessibility.AccessibilitySlicePreferenceController; -import com.android.settings.testutils.FakeIndexProvider; import com.android.settings.search.SearchFeatureProvider; import com.android.settings.search.SearchFeatureProviderImpl; import com.android.settings.testutils.FakeFeatureFactory; +import com.android.settings.testutils.FakeIndexProvider; import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java index c571d85ccb0..bea5e8933a3 100644 --- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java +++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java @@ -27,11 +27,11 @@ import android.database.sqlite.SQLiteDatabase; import android.net.Uri; import android.view.accessibility.AccessibilityManager; -import com.android.settings.testutils.FakeIndexProvider; import com.android.settings.search.SearchFeatureProvider; import com.android.settings.search.SearchFeatureProviderImpl; import com.android.settings.testutils.DatabaseTestUtils; import com.android.settings.testutils.FakeFeatureFactory; +import com.android.settings.testutils.FakeIndexProvider; import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; @@ -40,14 +40,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowAccessibilityManager; import java.util.ArrayList; import java.util.List; import java.util.Locale; -import org.robolectric.shadow.api.Shadow; - @RunWith(SettingsRobolectricTestRunner.class) public class SlicesDatabaseAccessorTest { diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java index 783ffa0c65c..602a7fd8217 100644 --- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java +++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java @@ -17,6 +17,7 @@ package com.android.settings.slices; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java index 748aa0ca302..460979426e2 100644 --- a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java @@ -36,20 +36,20 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; - import static org.robolectric.Shadows.shadowOf; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothManager; -import android.content.pm.PackageManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.IntentFilter; +import android.content.pm.PackageManager; +import android.util.FeatureFlagUtils; + import androidx.preference.ListPreference; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; -import android.util.FeatureFlagUtils; import com.android.settings.R; import com.android.settings.core.FeatureFlags; diff --git a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java index 4e67143c084..a90f39de064 100644 --- a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java @@ -34,6 +34,7 @@ import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothManager; import android.content.Context; import android.media.AudioManager; + import androidx.preference.ListPreference; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java index e1b93016980..732affa171e 100644 --- a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java @@ -36,6 +36,7 @@ import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothManager; import android.content.Context; import android.media.AudioManager; + import androidx.preference.ListPreference; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java index c6583c7eb03..a6acf2773eb 100644 --- a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java +++ b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java @@ -30,7 +30,6 @@ import com.android.settings.R; import com.android.settings.Settings; import com.android.settings.fingerprint.FingerprintEnrollSuggestionActivity; import com.android.settings.fingerprint.FingerprintSuggestionActivity; -import com.android.settings.notification.ZenOnboardingActivity; import com.android.settings.notification.ZenSuggestionActivity; import com.android.settings.support.NewDeviceIntroSuggestionActivity; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java index 8b03376afe3..c819f48560b 100644 --- a/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java @@ -16,14 +16,17 @@ package com.android.settings.support; -import static com.android.settings.support.NewDeviceIntroSuggestionActivity.PERMANENT_DISMISS_THRESHOLD; -import static com.android.settings.support.NewDeviceIntroSuggestionActivity.PREF_KEY_SUGGGESTION_COMPLETE; -import static com.android.settings.support.NewDeviceIntroSuggestionActivity.PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME; - +import static com.android.settings.support.NewDeviceIntroSuggestionActivity + .PERMANENT_DISMISS_THRESHOLD; +import static com.android.settings.support.NewDeviceIntroSuggestionActivity + .PREF_KEY_SUGGGESTION_COMPLETE; +import static com.android.settings.support.NewDeviceIntroSuggestionActivity + .PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME; import static com.android.settings.support.NewDeviceIntroSuggestionActivity.TIPS_PACKAGE_NAME; import static com.android.settings.support.NewDeviceIntroSuggestionActivity.isSuggestionComplete; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java index b44a719624f..dd54d6e094c 100644 --- a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java +++ b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java @@ -1,6 +1,7 @@ package com.android.settings.survey; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.never; @@ -12,6 +13,7 @@ import android.app.Activity; import android.content.BroadcastReceiver; import android.content.Context; import android.content.IntentFilter; + import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.android.settings.core.InstrumentedPreferenceFragment; diff --git a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java index 0c26650798a..4245c96e450 100644 --- a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java @@ -20,7 +20,9 @@ import static android.os.SystemUpdateManager.KEY_TITLE; import static android.os.SystemUpdateManager.STATUS_IDLE; import static android.os.SystemUpdateManager.STATUS_UNKNOWN; import static android.os.SystemUpdateManager.STATUS_WAITING_DOWNLOAD; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; @@ -28,6 +30,7 @@ import android.os.Build; import android.os.Bundle; import android.os.SystemUpdateManager; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java index f071f173633..176793f9e02 100644 --- a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java +++ b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java @@ -15,8 +15,6 @@ */ package com.android.settings.testutils; -import java.net.MalformedURLException; -import java.net.URL; import org.junit.runners.model.InitializationError; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; @@ -24,6 +22,8 @@ import org.robolectric.manifest.AndroidManifest; import org.robolectric.res.Fs; import org.robolectric.res.ResourcePath; +import java.net.MalformedURLException; +import java.net.URL; import java.util.List; /** diff --git a/tests/robotests/src/com/android/settings/testutils/SliceTester.java b/tests/robotests/src/com/android/settings/testutils/SliceTester.java index 332617b8a2f..3f0a023d4ec 100644 --- a/tests/robotests/src/com/android/settings/testutils/SliceTester.java +++ b/tests/robotests/src/com/android/settings/testutils/SliceTester.java @@ -21,22 +21,12 @@ import static android.app.slice.Slice.SUBTYPE_COLOR; import static android.app.slice.SliceItem.FORMAT_INT; import static android.app.slice.SliceItem.FORMAT_TEXT; -import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; -import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING; -import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; -import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; - import static com.google.common.truth.Truth.assertThat; import android.app.PendingIntent; import android.content.Context; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - +import androidx.core.graphics.drawable.IconCompat; import androidx.slice.Slice; import androidx.slice.SliceItem; import androidx.slice.SliceMetadata; @@ -45,13 +35,16 @@ import androidx.slice.core.SliceAction; import androidx.slice.core.SliceQuery; import androidx.slice.widget.EventInfo; -import androidx.core.graphics.drawable.IconCompat; - import com.android.settings.Utils; import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.slices.SliceBuilderUtils; import com.android.settings.slices.SliceData; +import java.util.Arrays; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + /** * Testing utility class to verify the contents of the different Settings Slices. * diff --git a/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java b/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java index 2b27649a926..7e8493e0efe 100644 --- a/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java @@ -1,13 +1,14 @@ package com.android.settings.testutils; +import android.content.Context; import android.content.res.Resources; import android.content.res.XmlResourceParser; - -import android.content.Context; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Xml; + import com.android.settings.core.PreferenceXmlParserUtils; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java index 00aa9ec8244..124b5ead8a4 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java @@ -17,10 +17,7 @@ package com.android.settings.testutils.shadow; import android.bluetooth.BluetoothDevice; -import android.os.Parcel; -import android.os.Parcelable; -import org.robolectric.shadows.ShadowBluetoothDevice; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java index b184eb2a49e..226100238fd 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java @@ -1,6 +1,7 @@ package com.android.settings.testutils.shadow; import static android.util.TypedValue.TYPE_REFERENCE; + import static org.robolectric.RuntimeEnvironment.application; import static org.robolectric.Shadows.shadowOf; import static org.robolectric.shadow.api.Shadow.directlyOn; @@ -14,13 +15,14 @@ import android.content.res.TypedArray; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import androidx.annotation.ArrayRes; -import androidx.annotation.ColorRes; -import androidx.annotation.Nullable; import android.util.AttributeSet; import android.util.SparseArray; import android.util.TypedValue; +import androidx.annotation.ArrayRes; +import androidx.annotation.ColorRes; +import androidx.annotation.Nullable; + import com.android.settings.R; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java index 12173c8f1de..c41aa8ee223 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java @@ -17,6 +17,7 @@ package com.android.settings.testutils.shadow; import com.android.settings.applications.AppInfoBase; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java index 886f94157ea..cee04ca351e 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java @@ -18,7 +18,9 @@ package com.android.settings.testutils.shadow; import android.os.UserHandle; import android.os.UserManager; + import com.android.settings.notification.AudioHelper; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java index 3c3714547dd..bcf90c440fb 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java @@ -18,12 +18,12 @@ package com.android.settings.testutils.shadow; import static android.media.AudioManager.STREAM_ACCESSIBILITY; import static android.media.AudioManager.STREAM_ALARM; +import static android.media.AudioManager.STREAM_DTMF; import static android.media.AudioManager.STREAM_MUSIC; import static android.media.AudioManager.STREAM_NOTIFICATION; import static android.media.AudioManager.STREAM_RING; import static android.media.AudioManager.STREAM_SYSTEM; import static android.media.AudioManager.STREAM_VOICE_CALL; -import static android.media.AudioManager.STREAM_DTMF; import static org.robolectric.RuntimeEnvironment.application; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java index 55c1c45982e..75526c85051 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java @@ -17,9 +17,10 @@ package com.android.settings.testutils.shadow; import android.content.Context; -import androidx.cardview.widget.CardView; import android.util.AttributeSet; +import androidx.cardview.widget.CardView; + import org.robolectric.annotation.Implements; import org.robolectric.shadows.ShadowFrameLayout; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java index 50c0330828a..7c543b74b38 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java @@ -16,19 +16,18 @@ package com.android.settings.testutils.shadow; +import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS; + import android.accounts.Account; import android.content.ContentResolver; import android.content.SyncAdapterType; - import android.database.Cursor; import android.database.MatrixCursor; import android.net.Uri; import android.provider.SearchIndexablesContract; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -import org.robolectric.annotation.Resetter; - -import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS; import java.util.HashMap; import java.util.Map; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java index 34908ca39a8..88b0b5fc0f7 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java @@ -1,6 +1,7 @@ package com.android.settings.testutils.shadow; import com.android.settings.datausage.DataSaverBackend; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java index 73cabfb1599..9b8821a6b57 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java @@ -4,6 +4,7 @@ import android.content.Context; import android.telephony.SubscriptionManager; import com.android.settings.datausage.DataUsageUtils; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java index f8242970130..8aa5dab9107 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java @@ -19,7 +19,9 @@ package com.android.settings.testutils.shadow; import android.content.Context; import android.content.pm.ResolveInfo; + import com.android.settings.search.DatabaseIndexingUtils; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java index f22c7d6a045..e4be3185ea7 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java @@ -19,6 +19,7 @@ package com.android.settings.testutils.shadow; import android.content.Context; import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; + import androidx.annotation.NonNull; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java index faaa0f05bfd..68c92a71569 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java @@ -16,10 +16,10 @@ package com.android.settings.testutils.shadow; -import android.media.MediaRouter; - import static org.robolectric.RuntimeEnvironment.application; +import android.media.MediaRouter; + import org.robolectric.annotation.Implements; import org.robolectric.annotation.Resetter; import org.robolectric.shadow.api.Shadow; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMobileNetworkPreferenceController.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMobileNetworkPreferenceController.java index 8d7606335d2..364083e699f 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMobileNetworkPreferenceController.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMobileNetworkPreferenceController.java @@ -1,7 +1,9 @@ package com.android.settings.testutils.shadow; import android.content.Context; + import com.android.settings.network.MobileNetworkPreferenceController; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java index c11f79cc4da..35c6630ba47 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java @@ -18,9 +18,10 @@ package com.android.settings.testutils.shadow; import android.content.Context; import android.content.pm.PackageManager; +import android.text.TextUtils; + import androidx.annotation.NonNull; import androidx.core.content.PermissionChecker; -import android.text.TextUtils; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java index f39f10f327b..372116ca95d 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java @@ -1,8 +1,10 @@ package com.android.settings.testutils.shadow; import android.content.Context; + import com.android.settings.bluetooth.RestrictionUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java index 5a71b58ec7a..d35ea5cb535 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java @@ -18,6 +18,7 @@ package com.android.settings.testutils.shadow; import android.os.AsyncTask; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.shadows.ShadowAsyncTask; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java index 834d285c955..f11d9e889d2 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java @@ -19,7 +19,6 @@ package com.android.settings.testutils.shadow; import android.content.Context; import android.content.pm.permission.RuntimePermissionPresenter; - import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.java index 586ff488351..e5f95c37d04 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.java @@ -19,6 +19,7 @@ package com.android.settings.testutils.shadow; import android.os.Bundle; import com.android.settings.SettingsPreferenceFragment; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowShortcutManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowShortcutManager.java index 8e24bd77a51..825e5aa3c4a 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowShortcutManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowShortcutManager.java @@ -20,12 +20,14 @@ import static org.robolectric.RuntimeEnvironment.application; import android.content.pm.ShortcutInfo; import android.content.pm.ShortcutManager; -import java.util.List; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.annotation.Resetter; import org.robolectric.shadow.api.Shadow; +import java.util.List; + @Implements(ShortcutManager.class) public class ShadowShortcutManager extends org.robolectric.shadows.ShadowShortcutManager { diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java index 03991e64e3e..b465521448a 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java @@ -21,10 +21,12 @@ import android.os.SystemProperties; import android.provider.Settings; import android.text.TextUtils; import android.view.View; -import java.util.Locale; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; +import java.util.Locale; + /** * Important: The current robolectric doesn't support API 24, so I copy the code * from API 24 here to make it compatible. Once robolectric is upgraded to 24, diff --git a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java index 10b2acb9ed0..12cde859cc4 100644 --- a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java @@ -16,17 +16,19 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.UserInfo; import android.os.UserManager; import android.provider.Settings.Global; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java index 782e94d3976..ba2095b05f8 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; @@ -25,9 +26,10 @@ import android.content.Context; import android.content.DialogInterface; import android.content.pm.UserInfo; import android.os.UserManager; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java index 6247feb16ba..c20866e186f 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; @@ -24,6 +25,7 @@ import android.app.Fragment; import android.content.Context; import android.content.pm.UserInfo; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java index 176d1b0492c..85a5e34ca3e 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java b/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java index d85f2fa8732..e07a4ad7d63 100644 --- a/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java +++ b/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java @@ -17,6 +17,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java index 2eeecaa4d4f..abdf4f513ff 100644 --- a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java @@ -17,6 +17,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java index ef8fae65344..ed79cf22ea9 100644 --- a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java index a7fe91677ea..6f5b404b843 100644 --- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java +++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java index fd41c3682ee..f8c08eaf27e 100644 --- a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java +++ b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java @@ -17,6 +17,7 @@ package com.android.settings.vpn2; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java index fc708eff63b..9ae0e549477 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java @@ -17,6 +17,7 @@ package com.android.settings.wallpaper; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import static org.robolectric.Shadows.shadowOf; diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java index 82412403c5a..2713e92e02c 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java @@ -1,6 +1,7 @@ package com.android.settings.wallpaper; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -10,6 +11,7 @@ import static org.robolectric.RuntimeEnvironment.application; import android.app.Activity; import android.content.Intent; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java index 2a95bc2e95a..ee532582de5 100644 --- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java +++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java @@ -17,7 +17,9 @@ package com.android.settings.webview; import static android.provider.Settings.ACTION_WEBVIEW_SETTINGS; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java index a387d7870e0..3ae29d36bd6 100644 --- a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java +++ b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.wfd; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java index 6b4df47ea3f..454813fb14f 100644 --- a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.widget; import static androidx.lifecycle.Lifecycle.Event.ON_START; import static androidx.lifecycle.Lifecycle.Event.ON_STOP; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -26,9 +28,10 @@ import static org.mockito.Mockito.when; import android.app.ActionBar; import android.app.Activity; +import android.view.View; + import androidx.lifecycle.LifecycleOwner; import androidx.recyclerview.widget.RecyclerView; -import android.view.View; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java index f34c60baa93..a66f6d55ca0 100644 --- a/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; @@ -24,10 +25,11 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.view.View; import android.widget.Button; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java index 9ce63179ccf..c75d8fd463f 100644 --- a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java @@ -19,9 +19,10 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.view.View; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java index 6cb4f3d0234..ce366fe78de 100644 --- a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java @@ -19,9 +19,10 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.view.View; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java index 90470f64a1d..02add358f97 100644 --- a/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java @@ -27,6 +27,11 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.view.LayoutInflater; import android.view.View; +import android.widget.LinearLayout; + +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; +import androidx.preference.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -35,11 +40,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.preference.R; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; -import android.widget.LinearLayout; - @RunWith(SettingsRobolectricTestRunner.class) public class DisabledCheckBoxPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java index 3337bd4f8b5..0300b71bfd6 100644 --- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -36,13 +37,14 @@ import android.content.pm.PackageInfo; import android.content.pm.ResolveInfo; import android.graphics.drawable.ColorDrawable; import android.os.UserHandle; -import androidx.preference.Preference; import android.view.LayoutInflater; import android.view.View; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java index 48e918d9de0..3cbbbbec7d5 100644 --- a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java @@ -20,12 +20,13 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java index d952324a303..79f344d9220 100644 --- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java +++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -29,11 +30,12 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; +import android.view.View; + import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceViewHolder; import androidx.recyclerview.widget.RecyclerView; -import android.view.View; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/tests/robotests/src/com/android/settings/widget/HotspotApBandSelectionPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/HotspotApBandSelectionPreferenceTest.java index 0ffda3baa96..ed97e55a4bf 100644 --- a/tests/robotests/src/com/android/settings/widget/HotspotApBandSelectionPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/HotspotApBandSelectionPreferenceTest.java @@ -31,26 +31,21 @@ import static org.mockito.Mockito.when; import android.app.AlertDialog; import android.content.Context; import android.net.wifi.WifiConfiguration; -import android.os.Bundle; import android.os.Parcelable; import android.view.LayoutInflater; import android.view.View; import android.widget.Button; -import android.widget.CheckBox; import android.widget.LinearLayout; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import java.util.List; - @RunWith(SettingsRobolectricTestRunner.class) public class HotspotApBandSelectionPreferenceTest { private HotspotApBandSelectionPreference mPreference; diff --git a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java index 37d055e4576..07a0aa97ba1 100644 --- a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyLong; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java index b21090dacc9..e5cff2172a1 100644 --- a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java @@ -17,17 +17,19 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.CheckBox; import android.widget.LinearLayout; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java index f96519a4a1b..04b30892558 100644 --- a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java @@ -17,17 +17,19 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.Switch; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; diff --git a/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java b/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java index 5895db25a70..92f75e99e3e 100644 --- a/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java index 29cc1796930..64352d96638 100644 --- a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,6 +26,7 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.content.Context; import android.os.UserManager; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java index 80af1f92bff..5d914a2f273 100644 --- a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java @@ -17,15 +17,17 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static junit.framework.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.app.Application; -import androidx.preference.PreferenceViewHolder; import android.view.View; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java index f7c96ed5590..7edfd0be636 100644 --- a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java +++ b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java @@ -19,11 +19,12 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; import android.os.Parcelable; -import androidx.viewpager.widget.PagerAdapter; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; +import androidx.viewpager.widget.PagerAdapter; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java index 77e18acae41..cafff056868 100644 --- a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java +++ b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java index 818daecd26d..ebfe74c3581 100644 --- a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java +++ b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.RuntimeEnvironment.application; import android.content.Context; @@ -25,8 +26,8 @@ import android.widget.TextView; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; - import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java index c88e7f87d00..e1c500211ea 100644 --- a/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java index c55ee9f56a9..ae55217b699 100644 --- a/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java @@ -18,9 +18,13 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.spy; + import android.content.Context; -import androidx.preference.ListPreference; import android.widget.ArrayAdapter; + +import androidx.preference.ListPreference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; @@ -34,8 +38,6 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; -import static org.mockito.Mockito.spy; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowBluetoothUtils.class) public class UpdatableListPreferenceDialogFragmentTest { diff --git a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java index 4e2ec7b2af1..ca7fab5ee51 100644 --- a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java @@ -25,13 +25,14 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.preference.PreferenceViewHolder; import android.text.InputType; import android.text.TextWatcher; import android.view.View; import android.widget.EditText; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -40,7 +41,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) public class ValidatedEditTextPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java index a2f859c6321..57f0679dbc8 100644 --- a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java @@ -22,9 +22,10 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.media.MediaPlayer; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java b/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java index d49c019aeb6..b65e5aefc0b 100644 --- a/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java +++ b/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java @@ -16,10 +16,11 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; -import android.content.pm.PackageInfo; import android.Manifest; +import android.content.pm.PackageInfo; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState.AppEntry; diff --git a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java index eb58452c60e..e12053cd4ac 100644 --- a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java b/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java index 012a76386de..6d8996068e4 100644 --- a/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java @@ -16,6 +16,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java index a0befc0e2de..be8eeae93d5 100644 --- a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java @@ -1,6 +1,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java index 5ec598a4a79..94f10ddd88b 100644 --- a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java @@ -19,12 +19,13 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.LinkifyUtils; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java index de629d83ecc..c9be0f6324e 100644 --- a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java @@ -17,14 +17,17 @@ package com.android.settings.wifi; import static android.provider.Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java index bc99fc24acf..84297919b4e 100644 --- a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java @@ -18,9 +18,12 @@ package com.android.settings.wifi; import static android.content.Context.NETWORK_SCORE_SERVICE; import static android.provider.Settings.Global.USE_OPEN_WIFI_PACKAGE; + import static com.android.settings.wifi.UseOpenWifiPreferenceController .REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -35,8 +38,9 @@ import android.content.Intent; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java index 43e87d83050..5e8dd28ba1f 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyBoolean; import static org.mockito.Mockito.anyInt; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java index 8cdecff0258..a6a13b30f1b 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java index 75c9bb14a5e..71a72981513 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java @@ -19,7 +19,6 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java index 19565f39bfc..d16647f3207 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java @@ -18,19 +18,22 @@ package com.android.settings.wifi; import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.BroadcastReceiver; import android.content.Context; import android.content.IntentFilter; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.provider.Settings; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java index 57ecfd0c37e..06d34794079 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java @@ -31,6 +31,7 @@ import android.net.NetworkRequest; import android.net.NetworkScoreManager; import android.net.wifi.WifiManager; import android.os.Handler; + import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java index ed312f4de70..610874a7a37 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java @@ -16,6 +16,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java index 0cd6bee16cf..7b95a46a845 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java @@ -24,15 +24,21 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; - -import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.SliceTester; - import android.content.Intent; import android.content.res.Resources; import android.net.wifi.WifiManager; + import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.widget.SliceLiveData; + +import com.android.settings.R; +import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SliceTester; import org.junit.Before; import org.junit.Test; @@ -41,13 +47,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.List; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.widget.SliceLiveData; - @RunWith(SettingsRobolectricTestRunner.class) public class WifiSliceBuilderTest { diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java index f55c57f8658..d40ead143be 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java index 38118f58586..ffe1d8fe84d 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java @@ -18,18 +18,19 @@ package com.android.settings.wifi; import static android.provider.Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE; import static android.provider.Settings.Global.WIFI_WAKEUP_ENABLED; + import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import android.app.Fragment; import android.content.Context; import android.location.LocationManager; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; diff --git a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java index 170cf53c1c3..a322dc2ab2d 100644 --- a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.app.Activity; diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java index 21f6daa3428..ea8fd00d594 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java @@ -26,7 +26,6 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import android.app.PendingIntent; import android.content.Context; @@ -47,7 +46,6 @@ import com.android.ims.ImsManager; import com.android.settings.R; import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.slices.SliceBroadcastReceiver; -import com.android.settings.slices.SliceBuilderUtils; import com.android.settings.slices.SliceData; import com.android.settings.slices.SlicesFeatureProvider; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java index 435882b1790..8b5c67f6a97 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.wifi.details; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; @@ -30,7 +31,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; -import androidx.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -51,12 +51,14 @@ import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.os.Handler; import android.provider.Settings; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; import android.view.View; import android.view.View.OnClickListener; import android.widget.ImageView; +import androidx.lifecycle.LifecycleOwner; +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.LayoutPreference; diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java index 13dc51dcd69..dd5dcc9a7b7 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java @@ -16,11 +16,13 @@ package com.android.settings.wifi.details; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; import android.net.wifi.WifiConfiguration; + import androidx.preference.DropDownPreference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java index 41b70e2674c..8921311b760 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi.p2p; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.never; diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java index 9741f4fd735..849c35acc88 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java @@ -17,10 +17,12 @@ package com.android.settings.wifi.p2p; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; import android.net.wifi.p2p.WifiP2pDevice; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java index fb4ffc354e2..75c5ffc2691 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java @@ -17,19 +17,22 @@ package com.android.settings.wifi.p2p; import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.net.wifi.WifiManager; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java b/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java index b6bf7e798da..fb7bef183ad 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java @@ -16,6 +16,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java index 4b81b345001..e1e872dacb7 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -26,6 +27,7 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; + import androidx.preference.PreferenceScreen; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java index 06373539f2e..519aa54e4a5 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; + import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java index a790d52aa85..1b063d0ff86 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -26,6 +27,7 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java index 9df86b879b3..c81c490ed12 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java @@ -16,27 +16,23 @@ package com.android.settings.wifi.tether; -import static androidx.lifecycle.Lifecycle.Event.ON_START; -import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; + import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.provider.Settings; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java index bbd57cba34b..a9d4a43c4fe 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -26,6 +27,7 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java index 86f03e0fdf4..f8131850fe3 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java @@ -10,6 +10,7 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; @@ -18,7 +19,6 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java index f5ac697fcf8..d22776f647f 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java @@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; -- GitLab