From 03fcde338bc5ddac2f864ea6202619a480e2613d Mon Sep 17 00:00:00 2001 From: Aurimas Liutikas Date: Tue, 17 Apr 2018 11:22:43 -0700 Subject: [PATCH] Migrate Settings to androidx. Test: make Settings Bug: 76692459 Change-Id: I941dea40562170649bf056e675cc32e5163c0e39 Merged-In: I941dea40562170649bf056e675cc32e5163c0e39 (cherry picked from commit a290b873d05c64ebdd9aeff8ffccf0a6dcbffc89) (cherry picked from commit b1af85d15523db44d4fa80c78409069ec691ed0a) --- Android.mk | 26 +++++++++---------- AndroidManifest.xml | 4 +-- proguard.flags | 6 ++--- res/layout/app_preference_item.xml | 2 +- res/layout/choose_lock_password.xml | 2 +- res/layout/condition_container.xml | 6 ++--- res/layout/condition_tile.xml | 4 +-- res/layout/manage_applications_apps.xml | 2 +- res/layout/preference_app.xml | 2 +- res/layout/preference_radio.xml | 2 +- res/layout/preview_seek_bar_view_pager.xml | 2 +- res/layout/recycler_view.xml | 2 +- res/layout/settings_main_dashboard.xml | 4 +-- res/layout/suggestion_container.xml | 2 +- res/layout/suggestion_tile.xml | 4 +-- res/layout/suggestion_tile_two_cards.xml | 4 +-- res/layout/suggestion_tile_with_button.xml | 4 +-- res/layout/time_zone_items_list.xml | 2 +- .../AccessiblePreferenceCategory.java | 4 +-- .../settings/BrightnessPreference.java | 2 +- .../settings/CancellablePreference.java | 4 +-- .../settings/CustomListPreference.java | 4 +-- src/com/android/settings/IccLockSettings.java | 4 +-- src/com/android/settings/LegalSettings.java | 4 +-- src/com/android/settings/MasterClear.java | 2 +- .../android/settings/PreviewPagerAdapter.java | 2 +- .../PreviewSeekBarPreferenceFragment.java | 4 +-- src/com/android/settings/PrivacySettings.java | 10 +++---- .../android/settings/ProgressCategory.java | 4 +-- .../settings/ProgressCategoryBase.java | 2 +- .../RegulatoryInfoDisplayActivity.java | 2 +- .../android/settings/ResetNetworkConfirm.java | 2 +- .../settings/RestrictedListPreference.java | 6 ++--- .../settings/RestrictedSettingsFragment.java | 2 +- .../android/settings/RingtonePreference.java | 6 ++--- .../android/settings/SettingsActivity.java | 10 +++---- .../android/settings/SettingsInitialize.java | 2 +- .../settings/SettingsLicenseActivity.java | 4 +-- .../settings/SettingsPreferenceFragment.java | 14 +++++----- .../android/settings/SetupWizardUtils.java | 2 +- .../android/settings/SummaryPreference.java | 4 +-- src/com/android/settings/TestingSettings.java | 2 +- src/com/android/settings/TetherSettings.java | 4 +-- .../settings/UserCredentialsSettings.java | 2 +- src/com/android/settings/Utils.java | 6 ++--- .../accessibility/AccessibilitySettings.java | 14 +++++----- .../AccessibilitySettingsForSetupWizard.java | 2 +- ...ibilitySettingsForSetupWizardActivity.java | 4 +-- ...cessibilityShortcutPreferenceFragment.java | 4 +-- .../CaptionPropertiesFragment.java | 8 +++--- .../accessibility/ColorPreference.java | 2 +- .../DividerAllowedBelowPreference.java | 4 +-- ...FeedbackIntensityPreferenceController.java | 2 +- .../accessibility/LocalePreference.java | 2 +- ...ificationGesturesPreferenceController.java | 2 +- ...gnificationNavbarPreferenceController.java | 2 +- .../MagnificationPreferenceFragment.java | 4 +-- ...ibrationIntensityPreferenceController.java | 2 +- .../ToggleAutoclickPreferenceFragment.java | 2 +- .../ToggleDaltonizerPreferenceFragment.java | 4 +-- .../ToggleFeaturePreferenceFragment.java | 4 +-- ...ScreenMagnificationPreferenceFragment.java | 6 ++--- ...ibrationIntensityPreferenceController.java | 4 +-- .../VibrationPreferenceFragment.java | 2 +- .../AccountDetailDashboardFragment.java | 4 +-- .../AccountHeaderPreferenceController.java | 4 +-- .../settings/accounts/AccountPreference.java | 4 +-- .../accounts/AccountPreferenceController.java | 8 +++--- .../AccountSyncPreferenceController.java | 6 ++--- .../accounts/AccountSyncSettings.java | 2 +- .../accounts/AccountTypePreference.java | 4 +-- .../accounts/AccountTypePreferenceLoader.java | 10 +++---- .../accounts/ChooseAccountActivity.java | 4 +-- .../EmergencyInfoPreferenceController.java | 2 +- .../accounts/ManagedProfileSettings.java | 4 +-- .../RemoveAccountPreferenceController.java | 2 +- .../accounts/SyncStateSwitchPreference.java | 4 +-- .../applications/AppInfoWithHeader.java | 2 +- .../applications/AppLaunchSettings.java | 6 ++--- .../applications/AppStateAppOpsBridge.java | 2 +- .../applications/AppStorageSettings.java | 6 ++--- .../AppStorageSizesController.java | 6 ++--- .../applications/ClearDefaultsPreference.java | 8 +++--- .../applications/DataSaverController.java | 2 +- .../DeviceAdministratorsController.java | 2 +- .../applications/DirectoryAccessDetails.java | 16 ++++++------ .../EnabledVrListenersController.java | 2 +- .../applications/HighPowerAppsController.java | 2 +- .../applications/LayoutPreference.java | 8 +++--- .../applications/ManageDomainUrls.java | 16 ++++++------ .../applications/PremiumSmsAccess.java | 10 +++---- .../applications/PremiumSmsController.java | 2 +- .../applications/ProcessStatsDetail.java | 4 +-- .../applications/ProcessStatsSummary.java | 4 +-- .../settings/applications/ProcessStatsUi.java | 4 +-- .../RecentAppsPreferenceController.java | 8 +++--- .../applications/SpacePreference.java | 8 +++--- .../applications/SpecialAccessSettings.java | 4 +-- .../SpecialAppAccessPreferenceController.java | 2 +- .../applications/UsageAccessDetails.java | 8 +++--- .../AppActionButtonPreferenceController.java | 4 +-- .../AppBatteryPreferenceController.java | 6 ++--- .../AppDataUsagePreferenceController.java | 6 ++--- .../AppHeaderViewPreferenceController.java | 2 +- .../appinfo/AppInfoDashboardFragment.java | 2 +- .../AppInfoPreferenceControllerBase.java | 4 +-- .../AppInstallerInfoPreferenceController.java | 2 +- .../AppMemoryPreferenceController.java | 4 +-- .../AppNotificationPreferenceController.java | 2 +- .../AppOpenByDefaultPreferenceController.java | 4 +-- .../AppPermissionPreferenceController.java | 4 +-- .../AppSettingPreferenceController.java | 2 +- .../AppStoragePreferenceController.java | 4 +-- ...ltAppShortcutPreferenceControllerBase.java | 2 +- .../appinfo/DrawOverlayDetails.java | 8 +++--- ...ernalSourceDetailPreferenceController.java | 4 +-- .../appinfo/ExternalSourcesDetails.java | 4 +-- ...InstantAppButtonsPreferenceController.java | 4 +-- ...InstantAppDomainsPreferenceController.java | 2 +- ...reInPictureDetailPreferenceController.java | 4 +-- .../appinfo/PictureInPictureDetails.java | 6 ++--- .../appinfo/PictureInPictureSettings.java | 6 ++--- .../TimeSpentInAppPreferenceController.java | 6 ++--- .../appinfo/WriteSettingsDetails.java | 8 +++--- .../AssistContextPreferenceController.java | 6 ++--- ...AssistFlashScreenPreferenceController.java | 6 ++--- .../AssistScreenshotPreferenceController.java | 6 ++--- .../assist/AssistSettingObserver.java | 2 +- .../DefaultAssistPreferenceController.java | 2 +- ...DefaultVoiceInputPreferenceController.java | 4 +-- .../DefaultAppPreferenceController.java | 2 +- .../defaultapps/DefaultAutofillPicker.java | 2 +- .../DefaultBrowserPreferenceController.java | 2 +- ...ltPaymentSettingsPreferenceController.java | 2 +- .../manageapplications/AppFilterItem.java | 2 +- .../manageapplications/AppFilterRegistry.java | 2 +- .../ApplicationViewHolder.java | 6 ++--- .../ManageApplications.java | 10 +++---- .../MusicViewHolderController.java | 2 +- .../PhotosViewHolderController.java | 2 +- .../ResetAppPrefPreferenceController.java | 2 +- .../backup/BackupSettingsActivity.java | 2 +- .../settings/backup/BackupSettingsHelper.java | 2 +- .../BackupSettingsPreferenceController.java | 4 +-- .../backup/ToggleBackupSettingFragment.java | 6 ++--- .../bluetooth/AlwaysDiscoverable.java | 2 +- .../AvailableMediaBluetoothDeviceUpdater.java | 4 +-- .../BluetoothDetailsButtonsController.java | 4 +-- .../bluetooth/BluetoothDetailsController.java | 4 +-- .../BluetoothDetailsHeaderController.java | 4 +-- .../BluetoothDetailsMacAddressController.java | 4 +-- .../BluetoothDetailsProfilesController.java | 12 ++++----- .../BluetoothDeviceDetailsFragment.java | 2 +- ...uetoothDeviceNamePreferenceController.java | 6 ++--- .../bluetooth/BluetoothDevicePreference.java | 4 +-- ...toothDeviceRenamePreferenceController.java | 4 +-- .../bluetooth/BluetoothDeviceUpdater.java | 4 +-- .../BluetoothDiscoverableEnabler.java | 2 +- .../BluetoothFilesPreferenceController.java | 4 +-- .../bluetooth/BluetoothPairingDetail.java | 2 +- .../bluetooth/BluetoothPairingDialog.java | 2 +- .../BluetoothPairingPreferenceController.java | 2 +- .../BluetoothPermissionActivity.java | 2 +- .../bluetooth/BluetoothSliceBuilder.java | 2 +- .../bluetooth/BluetoothSummaryUpdater.java | 2 +- .../ConnectedBluetoothDeviceUpdater.java | 4 +-- .../DeviceListPreferenceFragment.java | 8 +++--- .../bluetooth/DevicePickerFragment.java | 2 +- .../bluetooth/DeviceProfilesSettings.java | 2 +- .../RequestPermissionHelperActivity.java | 2 +- .../SavedBluetoothDeviceUpdater.java | 4 +-- src/com/android/settings/bluetooth/Utils.java | 2 +- .../AddDevicePreferenceController.java | 6 ++--- .../AdvancedConnectedDeviceController.java | 2 +- .../AvailableMediaDeviceGroupController.java | 10 +++---- .../BluetoothDashboardFragment.java | 2 +- .../ConnectedDeviceDashboardFragment.java | 2 +- .../ConnectedDeviceGroupController.java | 10 +++---- .../DevicePreferenceCallback.java | 2 +- ...iscoverableFooterPreferenceController.java | 2 +- ...lyConnectedDevicePreferenceController.java | 6 ++--- .../SavedDeviceGroupController.java | 8 +++--- .../usb/ConnectedUsbDeviceUpdater.java | 4 +-- .../connecteddevice/usb/UsbBackend.java | 2 +- .../usb/UsbDetailsController.java | 2 +- .../usb/UsbDetailsDataRoleController.java | 4 +-- .../usb/UsbDetailsFragment.java | 2 +- .../usb/UsbDetailsFunctionsController.java | 4 +-- .../usb/UsbDetailsHeaderController.java | 2 +- .../usb/UsbDetailsPowerRoleController.java | 10 +++---- .../core/BasePreferenceController.java | 6 ++--- .../core/InstrumentedPreferenceFragment.java | 4 +-- .../core/PreferenceXmlParserUtils.java | 4 +-- .../core/SliderPreferenceController.java | 6 ++--- .../settings/core/SubSettingLauncher.java | 2 +- .../core/TogglePreferenceController.java | 4 +-- .../settings/dashboard/DashboardAdapter.java | 8 +++--- .../settings/dashboard/DashboardData.java | 4 +-- .../dashboard/DashboardFeatureProvider.java | 2 +- .../DashboardFeatureProviderImpl.java | 4 +-- .../settings/dashboard/DashboardFragment.java | 8 +++--- .../dashboard/DashboardItemAnimator.java | 6 ++--- .../settings/dashboard/DashboardSummary.java | 6 ++--- ...rdTilePlaceholderPreferenceController.java | 4 +-- .../dashboard/RoundedHomepageIcon.java | 4 +-- .../settings/dashboard/SummaryLoader.java | 2 +- .../dashboard/conditional/Condition.java | 2 +- .../conditional/ConditionAdapter.java | 6 ++--- .../dashboard/conditional/DndCondition.java | 2 +- .../conditional/FocusRecyclerView.java | 4 +-- .../suggestions/SuggestionAdapter.java | 4 +-- .../SuggestionFeatureProvider.java | 2 +- .../SuggestionFeatureProviderImpl.java | 2 +- .../suggestions/SuggestionStateProvider.java | 2 +- .../settings/datausage/AppDataUsage.java | 6 ++--- .../datausage/AppDataUsagePreference.java | 2 +- .../settings/datausage/AppPrefLoader.java | 2 +- .../datausage/BillingCyclePreference.java | 2 +- .../datausage/BillingCycleSettings.java | 4 +-- .../datausage/CellDataPreference.java | 8 +++--- .../datausage/ChartDataUsagePreference.java | 6 ++--- .../datausage/DataSaverPreference.java | 2 +- .../settings/datausage/DataSaverSummary.java | 2 +- .../settings/datausage/DataUsageList.java | 6 ++--- .../datausage/DataUsagePreference.java | 6 ++--- .../settings/datausage/DataUsageSummary.java | 6 ++--- .../datausage/DataUsageSummaryLegacy.java | 6 ++--- .../datausage/DataUsageSummaryPreference.java | 4 +-- .../DataUsageSummaryPreferenceController.java | 6 ++--- .../NetworkRestrictionsPreference.java | 2 +- .../settings/datausage/SpinnerPreference.java | 4 +-- .../datausage/TemplatePreferenceCategory.java | 4 +-- .../datausage/UnrestrictedDataAccess.java | 4 +-- .../AutoTimeFormatPreferenceController.java | 6 ++--- .../AutoTimePreferenceController.java | 2 +- .../AutoTimeZonePreferenceController.java | 4 +-- .../datetime/DatePreferenceController.java | 4 +-- .../TimeFormatPreferenceController.java | 6 ++--- .../datetime/TimePreferenceController.java | 2 +- .../TimeZonePreferenceController.java | 4 +-- .../android/settings/datetime/ZonePicker.java | 2 +- .../timezone/BaseTimeZoneAdapter.java | 10 +++---- .../timezone/BaseTimeZoneInfoPicker.java | 2 +- .../datetime/timezone/BaseTimeZonePicker.java | 6 ++--- .../BaseTimeZonePreferenceController.java | 2 +- .../timezone/RegionPreferenceController.java | 2 +- .../datetime/timezone/RegionSearchPicker.java | 2 +- .../datetime/timezone/RegionZonePicker.java | 4 +-- .../RegionZonePreferenceController.java | 2 +- .../TimeZoneInfoPreferenceController.java | 4 +-- .../datetime/timezone/TimeZoneSettings.java | 4 +-- .../datetime/timezone/model/TimeZoneData.java | 4 +-- ...anagerDescriptionPreferenceController.java | 4 +-- .../AutomaticStorageManagerSettings.java | 6 ++--- ...aticStorageManagerSwitchBarController.java | 2 +- ...ractBluetoothA2dpPreferenceController.java | 8 +++--- .../development/AdbPreferenceController.java | 4 +-- ...lowAppsOnExternalPreferenceController.java | 6 ++--- ...atorDurationScalePreferenceController.java | 6 ++--- ...AppsNotRespondingPreferenceController.java | 6 ++--- ...roundProcessLimitPreferenceController.java | 6 ++--- ...oothA2dpHwOffloadPreferenceController.java | 6 ++--- ...othAbsoluteVolumePreferenceController.java | 6 ++--- ...toothAvrcpVersionPreferenceController.java | 6 ++--- ...toothDeviceNoNamePreferenceController.java | 6 ++--- ...ectedAudioDevicesPreferenceController.java | 8 +++--- ...BluetoothSnoopLogPreferenceController.java | 6 ++--- .../BugReportInPowerPreferenceController.java | 6 ++--- ...CameraLaserSensorPreferenceController.java | 4 +-- .../ClearAdbKeysPreferenceController.java | 6 ++--- .../development/ColorModePreference.java | 2 +- ...lColorTemperaturePreferenceController.java | 6 ++--- .../DarkUIPreferenceController.java | 6 ++--- .../DebugGpuOverdrawPreferenceController.java | 4 +-- ...ectClipOperationsPreferenceController.java | 4 +-- ...bugViewAttributesPreferenceController.java | 6 ++--- .../DevelopmentSettingsDashboardFragment.java | 4 +-- .../DevelopmentSwitchBarController.java | 2 +- ...eAutomaticUpdatesPreferenceController.java | 6 ++--- ...lateDisplayCutoutPreferenceController.java | 8 +++--- ...wMeasFullTrackingPreferenceController.java | 6 ++--- ...bleGpuDebugLayersPreferenceController.java | 6 ++--- .../FileEncryptionPreferenceController.java | 4 +-- ...ForceGpuRenderingPreferenceController.java | 6 ++--- .../ForceMSAAPreferenceController.java | 6 ++--- .../FreeformWindowsPreferenceController.java | 6 ++--- ...obalSettingSwitchPreferenceController.java | 4 +-- .../GpuViewUpdatesPreferenceController.java | 4 +-- ...wareLayersUpdatesPreferenceController.java | 4 +-- .../HardwareOverlaysPreferenceController.java | 6 ++--- .../HdcpCheckingPreferenceController.java | 6 ++--- .../KeepActivitiesPreferenceController.java | 8 +++--- ...calBackupPasswordPreferenceController.java | 4 +-- .../LocalTerminalPreferenceController.java | 8 +++--- .../LogPersistPreferenceController.java | 4 +-- .../LogdSizePreferenceController.java | 2 +- .../MemoryUsagePreferenceController.java | 6 ++--- ...obileDataAlwaysOnPreferenceController.java | 6 ++--- .../MockLocationAppPreferenceController.java | 2 +- ...onChannelWarningsPreferenceController.java | 6 ++--- .../OemUnlockPreferenceController.java | 6 ++--- .../PictureColorModePreferenceController.java | 4 +-- .../PointerLocationPreferenceController.java | 6 ++--- ...ofileGpuRenderingPreferenceController.java | 4 +-- ...ResizableActivityPreferenceController.java | 6 ++--- .../RtlLayoutPreferenceController.java | 6 ++--- .../SecondaryDisplayPreferenceController.java | 4 +-- ...cureSettingSwitchPreferenceController.java | 4 +-- .../SelectDebugAppPreferenceController.java | 4 +-- ...ManagerThrottlingPreferenceController.java | 2 +- ...wFirstCrashDialogPreferenceController.java | 6 ++--- .../ShowLayoutBoundsPreferenceController.java | 4 +-- ...howSurfaceUpdatesPreferenceController.java | 6 ++--- .../ShowTapsPreferenceController.java | 6 ++--- ...imulateColorSpacePreferenceController.java | 6 ++--- .../StayAwakePreferenceController.java | 6 ++--- .../StrictModePreferenceController.java | 6 ++--- ...stemSettingSwitchPreferenceController.java | 4 +-- ...ringHardwareAccelPreferenceController.java | 6 ++--- ...ionAnimationScalePreferenceController.java | 6 ++--- .../UsbAudioRoutingPreferenceController.java | 6 ++--- ...VerifyAppsOverUsbPreferenceController.java | 4 +-- .../WaitForDebuggerPreferenceController.java | 6 ++--- .../WebViewAppPreferenceController.java | 4 +-- ...dMacRandomizationPreferenceController.java | 6 ++--- ...playCertificationPreferenceController.java | 6 ++--- ...ifiVerboseLoggingPreferenceController.java | 6 ++--- ...dowAnimationScalePreferenceController.java | 6 ++--- .../featureflags/FeatureFlagPreference.java | 2 +- .../FeatureFlagsPreferenceController.java | 2 +- .../DevelopmentTilePreferenceController.java | 8 +++--- .../development/qstile/DevelopmentTiles.java | 2 +- .../BrandedAccountPreferenceController.java | 4 +-- .../BuildNumberPreferenceController.java | 4 +-- .../deviceinfo/DeviceInfoSettings.java | 2 +- .../DeviceModelPreferenceController.java | 4 +-- .../DeviceNamePreferenceController.java | 4 +-- .../FccEquipmentIdPreferenceController.java | 4 +-- .../FeedbackPreferenceController.java | 2 +- .../HardwareInfoDialogFragment.java | 2 +- .../KernelVersionPreferenceController.java | 2 +- .../PhoneNumberPreferenceController.java | 6 ++--- .../deviceinfo/PrivateVolumeSettings.java | 8 +++--- .../deviceinfo/PublicVolumeSettings.java | 4 +-- .../deviceinfo/StorageDashboardFragment.java | 2 +- .../deviceinfo/StorageItemPreference.java | 4 +-- .../deviceinfo/StorageProfileFragment.java | 2 +- .../settings/deviceinfo/StorageSettings.java | 8 +++--- .../deviceinfo/StorageSummaryPreference.java | 4 +-- .../deviceinfo/StorageVolumePreference.java | 4 +-- .../BasebandVersionDialogController.java | 2 +- .../BuildNumberDialogController.java | 2 +- .../FirmwareVersionDialogController.java | 2 +- .../FirmwareVersionPreferenceController.java | 4 +-- .../KernelVersionDialogController.java | 2 +- .../SecurityPatchLevelDialogController.java | 2 +- .../imei/ImeiInfoDialogController.java | 4 +-- .../imei/ImeiInfoDialogFragment.java | 4 +-- .../imei/ImeiInfoPreferenceController.java | 6 ++--- .../simstatus/SimStatusDialogController.java | 4 +-- .../SimStatusPreferenceController.java | 6 ++--- ...eManagementSwitchPreferenceController.java | 4 +-- .../storage/CachedStorageValuesHelper.java | 2 +- .../storage/SecondaryUserController.java | 10 +++---- .../StorageItemPreferenceController.java | 6 ++--- .../StorageSummaryDonutPreference.java | 4 +-- ...orageSummaryDonutPreferenceController.java | 4 +-- .../storage/UserProfileController.java | 4 +-- .../deviceinfo/storage/VolumeSizesLoader.java | 2 +- ...playNotificationsPreferenceController.java | 4 +-- .../AmbientDisplayPreferenceController.java | 2 +- .../android/settings/display/AppGridView.java | 2 +- .../AutoRotatePreferenceController.java | 2 +- ...BatteryPercentagePreferenceController.java | 4 +-- .../BrightnessLevelPreferenceController.java | 6 ++--- .../CameraGesturePreferenceController.java | 4 +-- .../display/ColorModePreferenceFragment.java | 4 +-- .../LiftToWakePreferenceController.java | 4 +-- ...DisplayActivationPreferenceController.java | 4 +-- ...htDisplayAutoModePreferenceController.java | 6 ++--- ...playCustomEndTimePreferenceController.java | 2 +- ...ayCustomStartTimePreferenceController.java | 2 +- ...ightDisplayFooterPreferenceController.java | 2 +- ...tDisplayIntensityPreferenceController.java | 4 +-- .../display/NightDisplayPreference.java | 2 +- .../display/NightDisplaySettings.java | 2 +- .../NightModePreferenceController.java | 6 ++--- .../ScreenSaverPreferenceController.java | 2 +- .../display/ScreenZoomPreference.java | 6 ++--- .../ShowOperatorNamePreferenceController.java | 4 +-- .../SystemUiThemePreferenceController.java | 6 ++--- .../TapToWakePreferenceController.java | 4 +-- .../display/ThemePreferenceController.java | 7 +++-- .../display/TimeoutPreferenceController.java | 2 +- .../VrDisplayPreferenceController.java | 2 +- .../WallpaperPreferenceController.java | 2 +- .../CurrentDreamPreferenceController.java | 2 +- .../android/settings/dream/DreamSettings.java | 2 +- .../dream/StartNowPreferenceController.java | 4 +-- .../WhenToDreamPreferenceController.java | 2 +- .../ActionDisabledByAdminDialog.java | 4 +-- .../ActionDisabledByAdminDialogHelper.java | 2 +- .../AdminActionPreferenceControllerBase.java | 2 +- ...edPermissionsPreferenceControllerBase.java | 2 +- ...sOnVpnCurrentUserPreferenceController.java | 2 +- .../ApplicationListPreferenceController.java | 4 +-- ...aCertsCurrentUserPreferenceController.java | 4 +-- ...rtsManagedProfilePreferenceController.java | 2 +- .../CaCertsPreferenceControllerBase.java | 2 +- ...InstalledPackagesPreferenceController.java | 2 +- ...EnterprisePrivacyPreferenceController.java | 2 +- ...etDefaultAppsListPreferenceController.java | 8 +++--- ...iseSetDefaultAppsPreferenceController.java | 2 +- ...dPasswordWipePreferenceControllerBase.java | 2 +- .../enterprise/ImePreferenceController.java | 2 +- ...ManageDeviceAdminPreferenceController.java | 2 +- .../FingerprintEnrollFindSensor.java | 2 +- ...FingerprintLocationAnimationVideoView.java | 2 +- .../fingerprint/FingerprintSettings.java | 12 ++++----- ...FingerprintStatusPreferenceController.java | 2 +- .../SetupFingerprintEnrollFindSensor.java | 2 +- .../fuelgauge/AdvancedPowerUsageDetail.java | 4 +-- .../AppButtonsPreferenceController.java | 4 +-- .../AutoRestrictionPreferenceController.java | 4 +-- ...ackgroundActivityPreferenceController.java | 4 +-- .../BatteryAppListPreferenceController.java | 8 +++--- .../fuelgauge/BatteryBroadcastReceiver.java | 4 +-- .../BatteryHeaderPreferenceController.java | 6 ++--- .../fuelgauge/BatteryHistoryPreference.java | 6 ++--- .../settings/fuelgauge/BatteryInfo.java | 2 +- .../settings/fuelgauge/BatteryMeterView.java | 2 +- ...tteryOptimizationPreferenceController.java | 4 +-- .../fuelgauge/BatterySaverController.java | 6 ++--- .../fuelgauge/BatteryStatsHelperLoader.java | 2 +- .../settings/fuelgauge/BatteryUtils.java | 10 +++---- .../fuelgauge/ButtonActionDialogFragment.java | 4 +-- .../settings/fuelgauge/InactiveApps.java | 8 +++--- .../fuelgauge/PowerGaugePreference.java | 2 +- .../fuelgauge/PowerUsageAdvanced.java | 2 +- .../fuelgauge/PowerUsageAnomalyDetails.java | 4 +-- .../settings/fuelgauge/PowerUsageBase.java | 2 +- .../settings/fuelgauge/PowerUsageSummary.java | 2 +- .../RestrictAppPreferenceController.java | 4 +-- .../fuelgauge/RestrictedAppDetails.java | 6 ++--- .../SmartBatteryPreferenceController.java | 4 +-- .../settings/fuelgauge/anomaly/Anomaly.java | 2 +- .../anomaly/AnomalyDetectionPolicy.java | 2 +- .../anomaly/AnomalyDialogFragment.java | 2 +- .../fuelgauge/anomaly/AnomalyLoader.java | 2 +- .../fuelgauge/anomaly/AnomalyPreference.java | 2 +- .../AnomalySummaryPreferenceController.java | 4 +-- .../fuelgauge/anomaly/AnomalyUtils.java | 2 +- .../anomaly/action/BackgroundCheckAction.java | 2 +- .../anomaly/action/LocationCheckAction.java | 4 +-- .../action/StopAndBackgroundCheckAction.java | 2 +- .../checker/BluetoothScanAnomalyDetector.java | 2 +- .../checker/WakeLockAnomalyDetector.java | 2 +- .../checker/WakeupAlarmAnomalyDetector.java | 2 +- .../AutoBatterySaverPreferenceController.java | 4 +-- ...utoBatterySeekBarPreferenceController.java | 6 ++--- ...atterySaverButtonPreferenceController.java | 4 +-- .../batterytip/AnomalyCleanupJobService.java | 2 +- .../batterytip/AnomalyConfigJobService.java | 2 +- .../batterytip/AnomalyDatabaseHelper.java | 2 +- .../AnomalyDetectionJobService.java | 4 +-- .../fuelgauge/batterytip/AppInfo.java | 2 +- .../BatteryManagerPreferenceController.java | 4 +-- .../batterytip/BatteryTipDialogFragment.java | 6 ++--- .../batterytip/BatteryTipLoader.java | 2 +- .../batterytip/BatteryTipPolicy.java | 2 +- .../BatteryTipPreferenceController.java | 8 +++--- .../fuelgauge/batterytip/BatteryTipUtils.java | 2 +- .../batterytip/HighUsageAdapter.java | 2 +- .../batterytip/StatsManagerConfig.java | 2 +- .../OpenRestrictAppFragmentAction.java | 2 +- .../batterytip/actions/RestrictAppAction.java | 2 +- .../actions/UnrestrictAppAction.java | 2 +- .../detectors/HighUsageDetector.java | 2 +- .../detectors/RestrictAppDetector.java | 2 +- .../fuelgauge/batterytip/tips/BatteryTip.java | 8 +++--- .../batterytip/tips/HighUsageTip.java | 2 +- .../fuelgauge/batterytip/tips/SummaryTip.java | 2 +- ...stGestureSettingsPreferenceController.java | 4 +-- .../DoubleTapPowerPreferenceController.java | 2 +- .../DoubleTapScreenPreferenceController.java | 4 +-- .../DoubleTwistPreferenceController.java | 2 +- .../gestures/GesturePreferenceController.java | 8 +++--- .../settings/gestures/GestureSettings.java | 4 +-- .../GesturesSettingPreferenceController.java | 2 +- .../PickupGesturePreferenceController.java | 2 +- .../PreventRingingPreferenceController.java | 8 +++--- .../gestures/SwipeUpPreferenceController.java | 2 +- .../settings/graph/BottomLabelLayout.java | 6 ++--- .../android/settings/graph/UsageGraph.java | 2 +- .../GameControllerPreferenceController.java | 4 +-- .../InputMethodAndSubtypeEnabler.java | 2 +- .../KeyboardLayoutPickerFragment.java | 6 ++--- .../inputmethod/PhysicalKeyboardFragment.java | 10 +++---- .../PhysicalKeyboardPreferenceController.java | 2 +- .../inputmethod/SpellCheckerPreference.java | 2 +- .../SpellCheckerPreferenceController.java | 4 +-- .../inputmethod/SpellCheckersSettings.java | 8 +++--- .../UserDictionaryCursorLoader.java | 2 +- .../inputmethod/UserDictionaryList.java | 6 ++--- .../inputmethod/VirtualKeyboardFragment.java | 2 +- .../VirtualKeyboardPreferenceController.java | 2 +- .../language/LanguageAndInputSettings.java | 4 +-- .../PhoneLanguagePreferenceController.java | 2 +- .../language/PointerSpeedController.java | 2 +- .../UserDictionaryPreferenceController.java | 2 +- .../LocaleDragAndDropAdapter.java | 6 ++--- .../LocaleLinearLayoutManager.java | 6 ++--- .../localepicker/LocaleListEditor.java | 2 +- .../localepicker/LocaleRecyclerView.java | 2 +- ...BluetoothScanningPreferenceController.java | 4 +-- .../settings/location/InjectedSetting.java | 4 +-- .../settings/location/LocationEnabler.java | 2 +- .../LocationFooterPreferenceController.java | 6 ++--- .../LocationForWorkPreferenceController.java | 4 +-- .../LocationPreferenceController.java | 6 ++--- .../LocationScanningPreferenceController.java | 2 +- .../LocationServicePreferenceController.java | 8 +++--- .../settings/location/LocationSettings.java | 4 +-- .../location/LocationSliceBuilder.java | 2 +- ...ntLocationRequestPreferenceController.java | 8 +++--- ...tionRequestSeeAllPreferenceController.java | 8 +++--- .../settings/location/SettingsInjector.java | 2 +- .../WifiScanningPreferenceController.java | 4 +-- .../AirplaneModePreferenceController.java | 6 ++--- .../android/settings/network/ApnEditor.java | 14 +++++----- .../settings/network/ApnPreference.java | 4 +-- .../android/settings/network/ApnSettings.java | 4 +-- .../MobileNetworkPreferenceController.java | 6 ++--- .../MobilePlanPreferenceController.java | 2 +- .../network/NetworkDashboardFragment.java | 2 +- .../NetworkResetRestrictionChecker.java | 2 +- .../settings/network/NetworkScorerPicker.java | 6 ++--- ...tworkScorerPickerPreferenceController.java | 2 +- .../PrivateDnsModeDialogPreference.java | 2 +- .../PrivateDnsPreferenceController.java | 4 +-- .../network/ProxyPreferenceController.java | 4 +-- .../network/TetherPreferenceController.java | 6 ++--- .../network/VpnPreferenceController.java | 6 ++--- .../nfc/AndroidBeamPreferenceController.java | 4 +-- .../android/settings/nfc/BaseNfcEnabler.java | 2 +- .../settings/nfc/NfcAirplaneModeObserver.java | 4 +-- src/com/android/settings/nfc/NfcEnabler.java | 2 +- .../settings/nfc/NfcForegroundPreference.java | 4 +-- .../settings/nfc/NfcPaymentPreference.java | 2 +- .../settings/nfc/NfcPreferenceController.java | 6 ++--- .../android/settings/nfc/PaymentSettings.java | 4 +-- ...ModeAutomaticRulePreferenceController.java | 2 +- .../AbstractZenModePreferenceController.java | 4 +-- ...tVolumeRestrictedPreferenceController.java | 2 +- .../AllowSoundPreferenceController.java | 2 +- .../AppLinkPreferenceController.java | 2 +- .../notification/AppNotificationSettings.java | 10 +++---- .../BadgePreferenceController.java | 2 +- ...dgingNotificationPreferenceController.java | 8 +++--- .../BlockPreferenceController.java | 2 +- .../BootSoundPreferenceController.java | 8 +++--- .../ChannelGroupNotificationSettings.java | 2 +- .../ChannelNotificationSettings.java | 2 +- .../ConfigureNotificationSettings.java | 4 +-- .../DeletedChannelsPreferenceController.java | 2 +- .../DescriptionPreferenceController.java | 2 +- .../notification/DndPreferenceController.java | 2 +- ...mergencyBroadcastPreferenceController.java | 4 +-- .../HeaderPreferenceController.java | 8 +++--- .../ImportancePreferenceController.java | 2 +- .../LightsPreferenceController.java | 2 +- ...creenNotificationPreferenceController.java | 4 +-- .../NotificationAppPreference.java | 2 +- .../NotificationFooterPreference.java | 6 ++--- .../NotificationPreferenceController.java | 6 ++--- .../NotificationSettingsBase.java | 6 ++--- .../notification/NotificationStation.java | 6 ++--- .../NotificationSwitchBarPreference.java | 2 +- .../NotificationsOffPreferenceController.java | 2 +- ...PulseNotificationPreferenceController.java | 6 ++--- ...centNotifyingAppsPreferenceController.java | 8 +++--- .../RingVolumePreferenceController.java | 2 +- .../RingtonePreferenceControllerBase.java | 2 +- .../settings/notification/SettingPref.java | 8 +++--- .../notification/SettingPrefController.java | 4 +-- .../SoundPreferenceController.java | 4 +-- .../settings/notification/SoundSettings.java | 6 ++--- .../notification/SuppressorHelper.java | 2 +- .../VibrateWhenRingPreferenceController.java | 4 +-- .../VibrationPreferenceController.java | 2 +- .../VisibilityPreferenceController.java | 2 +- .../notification/VolumeSeekBarPreference.java | 4 +-- .../VolumeSeekBarPreferenceController.java | 6 ++--- .../WorkSoundPreferenceController.java | 10 +++---- .../notification/ZenAccessSettings.java | 8 +++--- ...tomaticRuleHeaderPreferenceController.java | 4 +-- ...tomaticRuleSwitchPreferenceController.java | 4 +-- .../ZenCustomRadioButtonPreference.java | 2 +- .../ZenFooterPreferenceController.java | 4 +-- ...eAddAutomaticRulePreferenceController.java | 4 +-- .../ZenModeAlarmsPreferenceController.java | 4 +-- ...odeAutomaticRulesPreferenceController.java | 8 +++--- ...ZenModeAutomationPreferenceController.java | 2 +- .../settings/notification/ZenModeBackend.java | 2 +- ...ModeBehaviorCallsPreferenceController.java | 2 +- ...odeBehaviorFooterPreferenceController.java | 2 +- ...rMsgEventReminderPreferenceController.java | 2 +- ...ModeBehaviorSoundPreferenceController.java | 2 +- ...odeBlockedEffectsPreferenceController.java | 2 +- .../ZenModeBlockedEffectsSettings.java | 2 +- .../ZenModeButtonPreferenceController.java | 2 +- .../ZenModeCallsPreferenceController.java | 6 ++--- .../ZenModeDurationPreferenceController.java | 4 +-- .../ZenModeEventRuleSettings.java | 8 +++--- .../ZenModeEventsPreferenceController.java | 4 +-- .../ZenModeMediaPreferenceController.java | 4 +-- .../ZenModeMessagesPreferenceController.java | 6 ++--- .../ZenModePreferenceController.java | 4 +-- .../ZenModeRemindersPreferenceController.java | 4 +-- ...ModeRepeatCallersPreferenceController.java | 6 ++--- .../notification/ZenModeRuleSettingsBase.java | 4 +-- .../ZenModeScheduleRuleSettings.java | 8 +++--- .../notification/ZenModeSettings.java | 2 +- ...odeSettingsFooterPreferenceController.java | 2 +- .../notification/ZenModeSliceBuilder.java | 2 +- ...deStarredContactsPreferenceController.java | 4 +-- .../ZenModeSystemPreferenceController.java | 4 +-- .../ZenModeVisEffectPreferenceController.java | 6 ++--- ...ModeVisEffectsAllPreferenceController.java | 4 +-- ...eVisEffectsCustomPreferenceController.java | 4 +-- ...odeVisEffectsNonePreferenceController.java | 4 +-- .../notification/ZenRulePreference.java | 4 +-- .../settings/overlay/FeatureFactoryImpl.java | 2 +- .../overlay/SurveyFeatureProvider.java | 4 +-- .../settings/password/ChooseLockGeneric.java | 6 ++--- .../password/ChooseLockGenericController.java | 4 +-- .../settings/password/ChooseLockPassword.java | 6 ++--- .../password/PasswordRequirementAdapter.java | 2 +- .../password/SetupChooseLockGeneric.java | 6 ++--- .../password/SetupChooseLockPassword.java | 2 +- .../password/SetupChooseLockPattern.java | 2 +- .../settings/password/SetupSkipDialog.java | 2 +- .../print/PrintJobSettingsFragment.java | 2 +- .../PrintSettingPreferenceController.java | 4 +-- .../settings/print/PrintSettingsFragment.java | 4 +-- .../search/BaseSearchIndexProvider.java | 4 +-- .../search/DatabaseIndexingManager.java | 2 +- .../settings/search/IndexDatabaseHelper.java | 2 +- .../search/SearchIndexableResourcesImpl.java | 2 +- .../search/indexing/IndexDataConverter.java | 2 +- ...ProfileScreenLockPreferenceController.java | 2 +- .../ChangeScreenLockPreferenceController.java | 4 +-- .../security/ConfigureKeyGuardDialog.java | 2 +- ...CredentialStoragePreferenceController.java | 2 +- .../security/CryptKeeperSettings.java | 2 +- .../EncryptionStatusPreferenceController.java | 2 +- .../LockUnificationPreferenceController.java | 4 +-- .../LockdownButtonPreferenceController.java | 4 +-- .../security/LockscreenDashboardFragment.java | 2 +- .../OwnerInfoPreferenceController.java | 8 +++--- .../ResetCredentialsPreferenceController.java | 2 +- .../security/ScreenPinningSettings.java | 8 +++--- .../security/SimLockPreferenceController.java | 4 +-- ...blePatternProfilePreferenceController.java | 4 +-- .../LockAfterTimeoutPreferenceController.java | 2 +- .../LockScreenPreferenceController.java | 4 +-- .../PatternVisiblePreferenceController.java | 4 +-- ...ButtonInstantLockPreferenceController.java | 4 +-- ...ManageTrustAgentsPreferenceController.java | 4 +-- .../TrustAgentListPreferenceController.java | 8 +++--- .../trustagent/TrustAgentManager.java | 2 +- .../trustagent/TrustAgentSettings.java | 6 ++--- .../settings/shortcut/CreateShortcut.java | 2 +- .../settings/sim/SimSelectNotification.java | 2 +- src/com/android/settings/sim/SimSettings.java | 4 +-- .../slices/SettingsSliceProvider.java | 2 +- .../settings/slices/SliceBuilderUtils.java | 2 +- .../settings/slices/SlicesDatabaseHelper.java | 2 +- .../settings/slices/SlicesIndexer.java | 2 +- .../AudioSwitchPreferenceController.java | 6 ++--- ...FreeProfileOutputPreferenceController.java | 2 +- .../MediaOutputPreferenceController.java | 2 +- .../NewDeviceIntroSuggestionActivity.java | 4 +-- .../system/SystemDashboardFragment.java | 6 ++--- .../SystemUpdatePreferenceController.java | 4 +-- .../settings/tts/TextToSpeechSettings.java | 4 +-- .../settings/tts/TtsEnginePreference.java | 4 +-- .../tts/TtsEnginePreferenceFragment.java | 2 +- ...AddUserWhenLockedPreferenceController.java | 2 +- .../users/AppRestrictionsFragment.java | 16 ++++++------ .../AutoSyncDataPreferenceController.java | 4 +-- .../users/EditUserPhotoController.java | 2 +- .../settings/users/UserDetailsSettings.java | 4 +-- .../settings/users/UserPreference.java | 2 +- .../android/settings/users/UserSettings.java | 12 ++++----- .../utils/ManagedServiceSettings.java | 4 +-- .../utils/SettingsDividerItemDecoration.java | 4 +-- .../settings/vpn2/AppManagementFragment.java | 2 +- .../android/settings/vpn2/AppPreference.java | 4 +-- .../settings/vpn2/LegacyVpnPreference.java | 4 +-- .../android/settings/vpn2/VpnSettings.java | 4 +-- .../WallpaperSuggestionActivity.java | 2 +- .../wallpaper/WallpaperTypeSettings.java | 4 +-- .../settings/webview/WebViewAppPicker.java | 2 +- .../settings/wfd/WifiDisplaySettings.java | 16 ++++++------ .../widget/ActionBarShadowController.java | 4 +-- .../widget/ActionButtonPreference.java | 6 ++--- .../widget/AppCheckBoxPreference.java | 2 +- .../settings/widget/AppPreference.java | 4 +-- .../settings/widget/AppSwitchPreference.java | 4 +-- .../widget/AspectRatioFrameLayout.java | 2 +- .../widget/DisabledCheckBoxPreference.java | 4 +-- .../android/settings/widget/DonutView.java | 2 +- .../settings/widget/DotsPageIndicator.java | 4 +-- .../widget/EntityHeaderController.java | 6 ++--- .../widget/FixedLineSummaryPreference.java | 4 +-- .../settings/widget/GearPreference.java | 2 +- .../HighlightablePreferenceGroupAdapter.java | 12 ++++----- .../HotspotApBandSelectionPreference.java | 2 +- .../settings/widget/LabeledSeekBar.java | 6 ++--- .../widget/MasterCheckBoxPreference.java | 2 +- .../widget/MasterSwitchController.java | 2 +- .../widget/MasterSwitchPreference.java | 2 +- .../widget/RadioButtonPickerFragment.java | 8 +++--- .../widget/RadioButtonPreference.java | 8 +++--- .../widget/RestrictedAppPreference.java | 4 +-- .../widget/RtlCompatibleViewPager.java | 2 +- .../settings/widget/SeekBarPreference.java | 6 ++--- .../settings/widget/SlidingTabLayout.java | 2 +- .../android/settings/widget/SwitchBar.java | 6 ++--- .../widget/TwoStateButtonPreference.java | 4 +-- ...UpdatableListPreferenceDialogFragment.java | 6 ++--- .../widget/ValidatedEditTextPreference.java | 4 +-- .../settings/widget/VideoPreference.java | 6 ++--- .../settings/widget/WorkOnlyCategory.java | 2 +- .../CellularFallbackPreferenceController.java | 4 +-- .../settings/wifi/ChangeWifiStateDetails.java | 6 ++--- .../wifi/ConnectedAccessPointPreference.java | 4 +-- .../settings/wifi/LinkablePreference.java | 6 ++--- .../wifi/LongPressAccessPointPreference.java | 2 +- ...otifyOpenNetworksPreferenceController.java | 6 ++--- .../wifi/RequestToggleWiFiActivity.java | 2 +- .../wifi/SavedAccessPointsWifiSettings.java | 6 ++--- .../wifi/UseOpenWifiPreferenceController.java | 8 +++--- .../android/settings/wifi/WifiAPITest.java | 4 +-- .../settings/wifi/WifiConfigController.java | 2 +- .../settings/wifi/WifiDetailPreference.java | 4 +-- .../settings/wifi/WifiDialogActivity.java | 2 +- .../android/settings/wifi/WifiEnabler.java | 2 +- .../wifi/WifiInfoPreferenceController.java | 6 ++--- .../WifiMasterSwitchPreferenceController.java | 2 +- .../settings/wifi/WifiPickerActivity.java | 2 +- .../wifi/WifiScanningRequiredFragment.java | 2 +- .../android/settings/wifi/WifiSettings.java | 6 ++--- .../settings/wifi/WifiSliceBuilder.java | 2 +- .../settings/wifi/WifiSummaryUpdater.java | 2 +- .../wifi/WifiWakeupPreferenceController.java | 8 +++--- .../wifi/calling/WifiCallingSettings.java | 2 +- .../calling/WifiCallingSettingsForSub.java | 8 +++--- .../wifi/calling/WifiCallingSliceHelper.java | 2 +- .../WifiDetailPreferenceController.java | 8 +++--- .../WifiMeteredPreferenceController.java | 10 +++---- .../p2p/P2pCategoryPreferenceController.java | 6 ++--- .../P2pThisDevicePreferenceController.java | 4 +-- .../settings/wifi/p2p/WifiP2pPeer.java | 4 +-- .../wifi/p2p/WifiP2pPersistentGroup.java | 4 +-- .../wifi/p2p/WifiP2pPreferenceController.java | 6 ++--- .../settings/wifi/p2p/WifiP2pSettings.java | 4 +-- .../WifiTetherApBandPreferenceController.java | 2 +- ...WifiTetherAutoOffPreferenceController.java | 4 +-- .../WifiTetherBasePreferenceController.java | 4 +-- ...ifiTetherPasswordPreferenceController.java | 4 +-- .../WifiTetherPreferenceController.java | 6 ++--- .../WifiTetherSSIDPreferenceController.java | 6 ++--- ...ifiTetherSecurityPreferenceController.java | 4 +-- .../wifi/tether/WifiTetherSettings.java | 2 +- .../tether/WifiTetherSwitchBarController.java | 2 +- .../android/settings/PrivacySettingsTest.java | 6 ++--- .../settings/SettingsDumpServiceTest.java | 2 +- .../SettingsPreferenceFragmentTest.java | 8 +++--- .../settings/SummaryPreferenceTest.java | 2 +- .../AccessibilitySettingsTest.java | 2 +- ...backIntensityPreferenceControllerTest.java | 2 +- ...ationGesturesPreferenceControllerTest.java | 2 +- ...icationNavbarPreferenceControllerTest.java | 2 +- ...tionIntensityPreferenceControllerTest.java | 6 ++--- .../ToggleFeaturePreferenceFragmentTest.java | 2 +- .../AccountDetailDashboardFragmentTest.java | 2 +- ...AccountHeaderPreferenceControllerTest.java | 8 +++--- .../AccountPreferenceControllerTest.java | 8 +++--- .../AccountSyncPreferenceControllerTest.java | 2 +- .../AccountTypePreferenceLoaderTest.java | 10 +++---- ...EmergencyInfoPreferenceControllerTest.java | 4 +-- ...RemoveAccountPreferenceControllerTest.java | 6 ++--- .../applications/AppInfoWithHeaderTest.java | 4 +-- ...ppPermissionsPreferenceControllerTest.java | 2 +- .../AppStorageSizesControllerTest.java | 2 +- .../applications/LayoutPreferenceTest.java | 4 +-- .../RecentAppsPreferenceControllerTest.java | 6 ++--- ...cialAppAccessPreferenceControllerTest.java | 2 +- ...pActionButtonPreferenceControllerTest.java | 2 +- .../AppBatteryPreferenceControllerTest.java | 4 +-- .../AppDataUsagePreferenceControllerTest.java | 2 +- ...AppHeaderViewPreferenceControllerTest.java | 6 ++--- .../AppInfoPreferenceControllerBaseTest.java | 4 +-- ...InstallerInfoPreferenceControllerTest.java | 2 +- .../AppMemoryPreferenceControllerTest.java | 4 +-- ...pNotificationPreferenceControllerTest.java | 4 +-- ...OpenByDefaultPreferenceControllerTest.java | 4 +-- ...AppPermissionPreferenceControllerTest.java | 4 +-- .../AppSettingPreferenceControllerTest.java | 2 +- .../AppStoragePreferenceControllerTest.java | 2 +- .../AppVersionPreferenceControllerTest.java | 2 +- ...pShortcutPreferenceControllerBaseTest.java | 4 +-- ...OverlayDetailPreferenceControllerTest.java | 2 +- ...lSourceDetailPreferenceControllerTest.java | 2 +- ...antAppButtonsPreferenceControllerTest.java | 4 +-- ...PictureDetailPreferenceControllerTest.java | 2 +- ...imeSpentInAppPreferenceControllerTest.java | 4 +-- ...ystemSettingsPreferenceControllerTest.java | 2 +- ...AssistContextPreferenceControllerTest.java | 8 +++--- ...stFlashScreenPreferenceControllerTest.java | 8 +++--- .../DefaultAppPickerFragmentTest.java | 2 +- .../DefaultAppPreferenceControllerTest.java | 2 +- ...faultAutofillPreferenceControllerTest.java | 2 +- ...efaultBrowserPreferenceControllerTest.java | 2 +- .../DefaultHomePreferenceControllerTest.java | 2 +- ...ymentSettingsPreferenceControllerTest.java | 2 +- .../ManageApplicationsTest.java | 6 ++--- ...tingsActivityPreferenceControllerTest.java | 2 +- ...ackupSettingsPreferenceControllerTest.java | 4 +-- .../BluetoothDetailsControllerEventsTest.java | 4 +-- .../BluetoothDetailsControllerTestBase.java | 6 ++--- ...luetoothDetailsProfilesControllerTest.java | 4 +-- ...othDeviceNamePreferenceControllerTest.java | 4 +-- ...hDeviceRenamePreferenceControllerTest.java | 4 +-- .../bluetooth/BluetoothDeviceUpdaterTest.java | 2 +- .../bluetooth/BluetoothEnablerTest.java | 2 +- ...luetoothFilesPreferenceControllerTest.java | 2 +- .../bluetooth/BluetoothPairingDetailTest.java | 2 +- ...etoothPairingPreferenceControllerTest.java | 2 +- .../bluetooth/BluetoothSliceBuilderTest.java | 2 +- .../DeviceListPreferenceFragmentTest.java | 2 +- .../AddDevicePreferenceControllerTest.java | 6 ++--- ...ailableMediaDeviceGroupControllerTest.java | 8 +++--- .../ConnectedDeviceGroupControllerTest.java | 10 +++---- ...verableFooterPreferenceControllerTest.java | 2 +- ...nnectedDevicePreferenceControllerTest.java | 2 +- .../SavedDeviceGroupControllerTest.java | 4 +-- .../usb/UsbDetailsDataRoleControllerTest.java | 6 ++--- .../UsbDetailsFunctionsControllerTest.java | 6 ++--- .../usb/UsbDetailsHeaderControllerTest.java | 8 +++--- .../UsbDetailsPowerRoleControllerTest.java | 8 +++--- .../core/BasePreferenceControllerTest.java | 6 ++--- .../InstrumentedPreferenceFragmentTest.java | 4 +-- .../core/SliderPreferenceControllerTest.java | 2 +- .../core/TogglePreferenceControllerTest.java | 2 +- .../dashboard/DashboardAdapterTest.java | 2 +- .../settings/dashboard/DashboardDataTest.java | 10 +++---- .../DashboardFeatureProviderImplTest.java | 2 +- .../dashboard/DashboardFragmentTest.java | 6 ++--- .../dashboard/DashboardItemAnimatorTest.java | 2 +- .../dashboard/DashboardSummaryTest.java | 2 +- ...lePlaceholderPreferenceControllerTest.java | 4 +-- .../conditional/ConditionAdapterTest.java | 2 +- .../settings/datausage/AppDataUsageTest.java | 4 +-- .../settings/datausage/AppPrefLoaderTest.java | 2 +- .../datausage/BillingCycleSettingsTest.java | 6 ++--- .../datausage/CellDataPreferenceTest.java | 2 +- ...aUsageSummaryPreferenceControllerTest.java | 2 +- .../DataUsageSummaryPreferenceTest.java | 2 +- .../datausage/UnrestrictedDataAccessTest.java | 4 +-- ...utoTimeFormatPreferenceControllerTest.java | 2 +- .../AutoTimeZonePreferenceControllerTest.java | 2 +- .../TimeFormatPreferenceControllerTest.java | 4 +-- .../timezone/BaseTimeZoneAdapterTest.java | 2 +- .../BaseTimeZonePreferenceControllerTest.java | 2 +- .../FixedOffsetPreferenceControllerTest.java | 2 +- .../RegionPreferenceControllerTest.java | 2 +- .../RegionZonePreferenceControllerTest.java | 2 +- .../TimeZoneInfoPreferenceControllerTest.java | 2 +- ...erDescriptionPreferenceControllerTest.java | 4 +-- ...StorageManagerSwitchBarControllerTest.java | 2 +- ...BluetoothA2dpPreferenceControllerTest.java | 6 ++--- .../AdbPreferenceControllerTest.java | 4 +-- ...ppsOnExternalPreferenceControllerTest.java | 4 +-- ...DurationScalePreferenceControllerTest.java | 4 +-- ...NotRespondingPreferenceControllerTest.java | 4 +-- ...dProcessLimitPreferenceControllerTest.java | 4 +-- ...A2dpHwOffloadPreferenceControllerTest.java | 4 +-- ...bsoluteVolumePreferenceControllerTest.java | 4 +-- ...BitsPerSamplePreferenceControllerTest.java | 6 ++--- ...ioChannelModePreferenceControllerTest.java | 6 ++--- ...othAudioCodecPreferenceControllerTest.java | 6 ++--- ...hAudioQualityPreferenceControllerTest.java | 6 ++--- ...dioSampleRatePreferenceControllerTest.java | 6 ++--- ...hAvrcpVersionPreferenceControllerTest.java | 4 +-- ...hDeviceNoNamePreferenceControllerTest.java | 4 +-- ...dAudioDevicesPreferenceControllerTest.java | 4 +-- ...toothSnoopLogPreferenceControllerTest.java | 4 +-- ...ReportInPowerPreferenceControllerTest.java | 4 +-- ...raLaserSensorPreferenceControllerTest.java | 4 +-- .../ClearAdbKeysPreferenceControllerTest.java | 4 +-- ...orTemperaturePreferenceControllerTest.java | 4 +-- .../DarkUIPreferenceControllerTest.java | 4 +-- ...ugGpuOverdrawPreferenceControllerTest.java | 4 +-- ...lipOperationsPreferenceControllerTest.java | 4 +-- ...iewAttributesPreferenceControllerTest.java | 4 +-- .../DevelopmentSwitchBarControllerTest.java | 6 ++--- ...omaticUpdatesPreferenceControllerTest.java | 4 +-- ...DisplayCutoutPreferenceControllerTest.java | 6 ++--- ...sFullTrackingPreferenceControllerTest.java | 4 +-- ...puDebugLayersPreferenceControllerTest.java | 4 +-- ...ileEncryptionPreferenceControllerTest.java | 4 +-- ...eGpuRenderingPreferenceControllerTest.java | 4 +-- .../ForceMSAAPreferenceControllerTest.java | 4 +-- ...eeformWindowsPreferenceControllerTest.java | 4 +-- ...puViewUpdatesPreferenceControllerTest.java | 4 +-- ...LayersUpdatesPreferenceControllerTest.java | 4 +-- ...dwareOverlaysPreferenceControllerTest.java | 4 +-- .../HdcpCheckingPreferenceControllerTest.java | 4 +-- ...eepActivitiesPreferenceControllerTest.java | 4 +-- ...ackupPasswordPreferenceControllerTest.java | 4 +-- ...LocalTerminalPreferenceControllerTest.java | 4 +-- .../LogPersistPreferenceControllerTest.java | 6 ++--- .../LogdSizePreferenceControllerTest.java | 4 +-- .../MemoryUsagePreferenceControllerTest.java | 4 +-- ...eDataAlwaysOnPreferenceControllerTest.java | 4 +-- ...ckLocationAppPreferenceControllerTest.java | 4 +-- ...annelWarningsPreferenceControllerTest.java | 4 +-- .../OemUnlockPreferenceControllerTest.java | 2 +- ...tureColorModePreferenceControllerTest.java | 8 +++--- ...interLocationPreferenceControllerTest.java | 4 +-- ...eGpuRenderingPreferenceControllerTest.java | 4 +-- ...zableActivityPreferenceControllerTest.java | 4 +-- .../RtlLayoutPreferenceControllerTest.java | 4 +-- ...ondaryDisplayPreferenceControllerTest.java | 4 +-- ...electDebugAppPreferenceControllerTest.java | 4 +-- ...gerThrottlingPreferenceControllerTest.java | 4 +-- ...stCrashDialogPreferenceControllerTest.java | 4 +-- ...wLayoutBoundsPreferenceControllerTest.java | 4 +-- ...urfaceUpdatesPreferenceControllerTest.java | 4 +-- .../ShowTapsPreferenceControllerTest.java | 4 +-- ...ateColorSpacePreferenceControllerTest.java | 4 +-- .../StayAwakePreferenceControllerTest.java | 2 +- .../StrictModePreferenceControllerTest.java | 4 +-- ...HardwareAccelPreferenceControllerTest.java | 4 +-- ...nimationScalePreferenceControllerTest.java | 4 +-- ...bAudioRoutingPreferenceControllerTest.java | 4 +-- ...fyAppsOverUsbPreferenceControllerTest.java | 2 +- ...itForDebuggerPreferenceControllerTest.java | 4 +-- .../WebViewAppPreferenceControllerTest.java | 4 +-- ...RandomizationPreferenceControllerTest.java | 4 +-- ...CertificationPreferenceControllerTest.java | 4 +-- ...erboseLoggingPreferenceControllerTest.java | 4 +-- ...nimationScalePreferenceControllerTest.java | 4 +-- .../FeatureFlagPreferenceControllerTest.java | 6 ++--- ...velopmentTilePreferenceControllerTest.java | 6 ++--- .../BuildNumberPreferenceControllerTest.java | 6 ++--- .../deviceinfo/DeviceInfoSettingsTest.java | 2 +- .../DeviceModelPreferenceControllerTest.java | 4 +-- .../DeviceNamePreferenceControllerTest.java | 2 +- ...ccEquipmentIdPreferenceControllerTest.java | 4 +-- .../FeedbackPreferenceControllerTest.java | 4 +-- .../deviceinfo/MyDeviceInfoFragmentTest.java | 2 +- .../PhoneNumberPreferenceControllerTest.java | 4 +-- ...egulatoryInfoPreferenceControllerTest.java | 4 +-- .../StorageDashboardFragmentTest.java | 2 +- .../deviceinfo/StorageItemPreferenceTest.java | 2 +- ...rmwareVersionPreferenceControllerTest.java | 4 +-- .../ImeiInfoPreferenceControllerTest.java | 4 +-- .../SimStatusDialogControllerTest.java | 2 +- .../SimStatusPreferenceControllerTest.java | 4 +-- ...agementSwitchPreferenceControllerTest.java | 4 +-- .../storage/SecondaryUserControllerTest.java | 6 ++--- .../StorageItemPreferenceControllerTest.java | 2 +- ...eSummaryDonutPreferenceControllerTest.java | 2 +- .../storage/UserProfileControllerTest.java | 4 +-- ...NotificationsPreferenceControllerTest.java | 2 +- ...mbientDisplayPreferenceControllerTest.java | 2 +- .../AutoRotatePreferenceControllerTest.java | 2 +- ...ightnessLevelPreferenceControllerTest.java | 4 +-- .../ColorModePreferenceControllerTest.java | 2 +- .../ColorModePreferenceFragmentTest.java | 4 +-- ...layActivationPreferenceControllerTest.java | 2 +- ...wOperatorNamePreferenceControllerTest.java | 2 +- ...SystemUiThemePreferenceControllerTest.java | 4 +-- .../ThemePreferenceControllerTest.java | 2 +- .../StartNowPreferenceControllerTest.java | 2 +- .../WhenToDreamPreferenceControllerTest.java | 2 +- ...minActionPreferenceControllerTestBase.java | 2 +- ...rmissionsPreferenceControllerTestBase.java | 2 +- ...pnCurrentUserPreferenceControllerTest.java | 2 +- ...anagedProfilePreferenceControllerTest.java | 2 +- .../ApplicationListFragmentTest.java | 4 +-- ...plicationListPreferenceControllerTest.java | 4 +-- ...ackupsEnabledPreferenceControllerTest.java | 2 +- ...tsCurrentUserPreferenceControllerTest.java | 2 +- .../CaCertsPreferenceControllerTestBase.java | 2 +- ...alledPackagesPreferenceControllerTest.java | 2 +- ...rprisePrivacyPreferenceControllerTest.java | 2 +- ...erpriseSetDefaultAppsListFragmentTest.java | 4 +-- ...faultAppsListPreferenceControllerTest.java | 6 ++--- ...etDefaultAppsPreferenceControllerTest.java | 2 +- ...swordWipePreferenceControllerTestBase.java | 2 +- ...obalHttpProxyPreferenceControllerTest.java | 2 +- .../ImePreferenceControllerTest.java | 2 +- ...geDeviceAdminPreferenceControllerTest.java | 2 +- .../FingerprintPreferenceTest.java | 2 +- ...erprintStatusPreferenceControllerTest.java | 2 +- .../AdvancedPowerUsageDetailTest.java | 4 +-- ...toRestrictionPreferenceControllerTest.java | 2 +- ...roundActivityPreferenceControllerTest.java | 2 +- ...atteryAppListPreferenceControllerTest.java | 2 +- ...BatteryHeaderPreferenceControllerTest.java | 10 +++---- .../BatteryHistoryPreferenceTest.java | 2 +- ...yOptimizationPreferenceControllerTest.java | 4 +-- .../fuelgauge/BatterySaverControllerTest.java | 2 +- .../fuelgauge/PowerGaugePreferenceTest.java | 2 +- .../fuelgauge/PowerUsageAdvancedTest.java | 2 +- .../PowerUsageAnomalyDetailsTest.java | 8 +++--- .../RestrictAppPreferenceControllerTest.java | 2 +- .../fuelgauge/RestrictedAppDetailsTest.java | 8 +++--- .../SmartBatteryPreferenceControllerTest.java | 2 +- ...nomalySummaryPreferenceControllerTest.java | 4 +-- ...oBatterySaverPreferenceControllerTest.java | 2 +- ...atterySeekBarPreferenceControllerTest.java | 2 +- ...rySaverButtonPreferenceControllerTest.java | 2 +- ...atteryManagerPreferenceControllerTest.java | 2 +- .../BatteryTipPreferenceControllerTest.java | 10 +++---- .../batterytip/tips/BatteryTipTest.java | 4 +-- .../GesturePreferenceControllerTest.java | 6 ++--- ...turesSettingsPreferenceControllerTest.java | 2 +- ...reventRingingPreferenceControllerTest.java | 4 +-- ...sicalKeyboardPreferenceControllerTest.java | 2 +- .../SpellCheckerPreferenceControllerTest.java | 2 +- ...rtualKeyboardPreferenceControllerTest.java | 4 +-- .../LanguageAndInputSettingsTest.java | 2 +- ...PhoneLanguagePreferenceControllerTest.java | 2 +- .../language/TtsPreferenceControllerTest.java | 4 +-- ...serDictionaryPreferenceControllerTest.java | 2 +- ...toothScanningPreferenceControllerTest.java | 2 +- .../location/LocationEnablerTest.java | 2 +- ...ocationFooterPreferenceControllerTest.java | 6 ++--- ...cationForWorkPreferenceControllerTest.java | 4 +-- .../LocationPreferenceControllerTest.java | 10 +++---- ...cationServicePreferenceControllerTest.java | 8 +++--- .../location/LocationSliceBuilderTest.java | 2 +- .../LocationSwitchBarControllerTest.java | 2 +- ...cationRequestPreferenceControllerTest.java | 8 +++--- ...RequestSeeAllPreferenceControllerTest.java | 6 ++--- .../WifiScanningPreferenceControllerTest.java | 2 +- .../AirplaneModePreferenceControllerTest.java | 6 ++--- .../settings/network/ApnEditorTest.java | 8 +++--- ...MobileNetworkPreferenceControllerTest.java | 10 +++---- ...kScorerPickerPreferenceControllerTest.java | 2 +- .../network/NetworkScorerPickerTest.java | 4 +-- .../PrivateDnsPreferenceControllerTest.java | 10 +++---- .../TetherPreferenceControllerTest.java | 2 +- .../network/VpnPreferenceControllerTest.java | 10 +++---- .../AndroidBeamPreferenceControllerTest.java | 2 +- .../nfc/NfcAirplaneModeObserverTest.java | 4 +-- .../nfc/NfcForegroundPreferenceTest.java | 4 +-- .../nfc/NfcPreferenceControllerTest.java | 4 +-- ...umeRestrictedPreferenceControllerTest.java | 2 +- .../AllowSoundPreferenceControllerTest.java | 4 +-- .../AppLinkPreferenceControllerTest.java | 2 +- .../BadgePreferenceControllerTest.java | 4 +-- ...gNotificationPreferenceControllerTest.java | 6 ++--- .../BootSoundPreferenceControllerTest.java | 4 +-- ...ChargingSoundPreferenceControllerTest.java | 4 +-- ...letedChannelsPreferenceControllerTest.java | 2 +- .../DescriptionPreferenceControllerTest.java | 2 +- .../DialPadTonePreferenceControllerTest.java | 4 +-- .../DndPreferenceControllerTest.java | 4 +-- ...ockAudioMediaPreferenceControllerTest.java | 4 +-- .../DockingSoundPreferenceControllerTest.java | 4 +-- ...EmergencyTonePreferenceControllerTest.java | 4 +-- .../HeaderPreferenceControllerTest.java | 2 +- .../ImportancePreferenceControllerTest.java | 4 +-- .../LightsPreferenceControllerTest.java | 4 +-- .../NotificationAppPreferenceTest.java | 4 +-- .../NotificationPreferenceControllerTest.java | 2 +- ...ificationsOffPreferenceControllerTest.java | 2 +- ...eNotificationPreferenceControllerTest.java | 6 ++--- ...NotifyingAppsPreferenceControllerTest.java | 6 ++--- .../RingtonePreferenceControllerBaseTest.java | 2 +- ...reenLockSoundPreferenceControllerTest.java | 4 +-- .../SettingPrefControllerTest.java | 2 +- .../SoundPreferenceControllerTest.java | 4 +-- .../TouchSoundPreferenceControllerTest.java | 4 +-- ...ibrateOnTouchPreferenceControllerTest.java | 4 +-- ...brateWhenRingPreferenceControllerTest.java | 6 ++--- .../VibrationPreferenceControllerTest.java | 4 +-- ...VolumeSeekBarPreferenceControllerTest.java | 4 +-- .../WorkSoundPreferenceControllerTest.java | 8 +++--- .../ZenCustomRadioButtonPreferenceTest.java | 4 +-- .../ZenFooterPreferenceControllerTest.java | 2 +- ...ZenModeAlarmsPreferenceControllerTest.java | 4 +-- ...utomaticRulesPreferenceControllerTest.java | 4 +-- ...BehaviorCallsPreferenceControllerTest.java | 2 +- ...ehaviorFooterPreferenceControllerTest.java | 4 +-- ...EventReminderPreferenceControllerTest.java | 2 +- ...BehaviorSoundPreferenceControllerTest.java | 2 +- ...ZenModeButtonPreferenceControllerTest.java | 4 +-- .../ZenModeCallsPreferenceControllerTest.java | 4 +-- ...nModeDurationPreferenceControllerTest.java | 4 +-- ...ZenModeEventsPreferenceControllerTest.java | 4 +-- .../ZenModeMediaPreferenceControllerTest.java | 4 +-- ...nModeMessagesPreferenceControllerTest.java | 4 +-- .../ZenModePreferenceControllerTest.java | 2 +- ...ModeRemindersPreferenceControllerTest.java | 4 +-- ...RepeatCallersPreferenceControllerTest.java | 4 +-- ...ettingsFooterPreferenceControllerTest.java | 4 +-- .../notification/ZenModeSliceBuilderTest.java | 2 +- ...arredContactsPreferenceControllerTest.java | 4 +-- ...ZenModeSystemPreferenceControllerTest.java | 4 +-- ...ModeVisEffectPreferenceControllerTest.java | 4 +-- ...VisEffectsAllPreferenceControllerTest.java | 2 +- ...EffectsCustomPreferenceControllerTest.java | 2 +- ...isEffectsNonePreferenceControllerTest.java | 2 +- ...PrintSettingsPreferenceControllerTest.java | 6 ++--- ...entialStoragePreferenceControllerTest.java | 2 +- ...ryptionStatusPreferenceControllerTest.java | 2 +- ...ckUnificationPreferenceControllerTest.java | 4 +-- ...ockdownButtonPreferenceControllerTest.java | 2 +- .../OwnerInfoPreferenceControllerTest.java | 6 ++--- ...tedEncryptionPreferenceControllerTest.java | 2 +- ...ScreenPinningPreferenceControllerTest.java | 2 +- .../ShowPasswordPreferenceControllerTest.java | 4 +-- .../SimLockPreferenceControllerTest.java | 4 +-- ...atternProfilePreferenceControllerTest.java | 2 +- .../LockScreenPreferenceControllerTest.java | 8 +++--- ...atternVisiblePreferenceControllerTest.java | 2 +- ...onInstantLockPreferenceControllerTest.java | 2 +- ...geTrustAgentsPreferenceControllerTest.java | 2 +- ...rustAgentListPreferenceControllerTest.java | 8 +++--- ...oOutputSwitchPreferenceControllerTest.java | 6 ++--- ...ProfileOutputPreferenceControllerTest.java | 6 ++--- .../MediaOutputPreferenceControllerTest.java | 6 ++--- .../settings/survey/SurveyMixinTest.java | 2 +- .../SystemUpdatePreferenceControllerTest.java | 4 +-- .../settings/testutils/ResIdSubject.java | 2 +- .../settings/testutils/SliceTester.java | 2 +- .../shadow/SettingsShadowResources.java | 6 ++--- .../testutils/shadow/ShadowBidiFormatter.java | 4 +-- .../testutils/shadow/ShadowCardView.java | 2 +- .../shadow/ShadowFingerprintManager.java | 2 +- .../shadow/ShadowPermissionChecker.java | 4 +-- ...serWhenLockedPreferenceControllerTest.java | 4 +-- .../AutoSyncDataPreferenceControllerTest.java | 6 ++--- ...cPersonalDataPreferenceControllerTest.java | 4 +-- .../wallpaper/WallpaperTypeSettingsTest.java | 2 +- .../widget/ActionBarShadowControllerTest.java | 8 +++--- .../widget/ActionButtonPreferenceTest.java | 2 +- .../settings/widget/AppPreferenceTest.java | 2 +- .../widget/AppSwitchPreferenceTest.java | 2 +- .../DisabledCheckBoxPreferenceTest.java | 6 ++--- .../widget/EntityHeaderControllerTest.java | 2 +- .../FixedLineSummaryPreferenceTest.java | 2 +- ...ghlightablePreferenceGroupAdapterTest.java | 8 +++--- .../widget/MasterCheckBoxPreferenceTest.java | 4 +-- .../widget/MasterSwitchPreferenceTest.java | 4 +-- .../widget/RadioButtonPickerFragmentTest.java | 2 +- .../widget/RadioButtonPreferenceTest.java | 2 +- .../widget/RtlCompatibleViewPagerTest.java | 2 +- ...tableListPreferenceDialogFragmentTest.java | 2 +- .../ValidatedEditTextPreferenceTest.java | 2 +- .../settings/widget/VideoPreferenceTest.java | 2 +- .../settings/wifi/LinkablePreferenceTest.java | 2 +- ...fyOpenNetworkPreferenceControllerTest.java | 4 +-- .../UseOpenWifiPreferenceControllerTest.java | 4 +-- .../WifiInfoPreferenceControllerTest.java | 10 +++---- ...iMasterSwitchPreferenceControllerTest.java | 4 +-- .../settings/wifi/WifiSliceBuilderTest.java | 2 +- .../WifiWakeupPreferenceControllerTest.java | 4 +-- .../WifiDetailPreferenceControllerTest.java | 6 ++--- .../WifiMeteredPreferenceControllerTest.java | 2 +- .../P2pCategoryPreferenceControllerTest.java | 6 ++--- ...P2pThisDevicePreferenceControllerTest.java | 4 +-- .../p2p/WifiP2PPreferenceControllerTest.java | 10 +++---- ...iTetherApBandPreferenceControllerTest.java | 2 +- ...TetherAutoOffPreferenceControllerTest.java | 2 +- ...etherPasswordPreferenceControllerTest.java | 2 +- .../WifiTetherPreferenceControllerTest.java | 8 +++--- ...ifiTetherSSIDPreferenceControllerTest.java | 2 +- ...etherSecurityPreferenceControllerTest.java | 4 +-- .../applications/AppOpsSettingsTest.java | 2 +- .../ThemePreferenceControllerTest.java | 2 +- .../print/PrintJobSettingsActivityTest.java | 2 +- 1190 files changed, 2367 insertions(+), 2368 deletions(-) diff --git a/Android.mk b/Android.mk index e37e9fbff1a..0466a1fd69a 100644 --- a/Android.mk +++ b/Android.mk @@ -21,17 +21,17 @@ LOCAL_USE_AAPT2 := true LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_ANDROID_LIBRARIES := \ - android-slices-builders \ - android-slices-core \ - android-slices-view \ - android-support-compat \ - android-support-v4 \ - android-support-v13 \ - android-support-v7-appcompat \ - android-support-v7-cardview \ - android-support-v7-preference \ - android-support-v7-recyclerview \ - android-support-v14-preference \ + androidx.slice_slice-builders \ + androidx.slice_slice-core \ + androidx.slice_slice-view \ + androidx.core_core \ + androidx.legacy_legacy-support-v4 \ + androidx.legacy_legacy-support-v13 \ + androidx.appcompat_appcompat \ + androidx.cardview_cardview \ + androidx.preference_preference \ + androidx.recyclerview_recyclerview \ + androidx.legacy_legacy-preference-v14 \ LOCAL_JAVA_LIBRARIES := \ bouncycastle \ @@ -39,8 +39,8 @@ LOCAL_JAVA_LIBRARIES := \ ims-common LOCAL_STATIC_JAVA_LIBRARIES := \ - android-arch-lifecycle-runtime \ - android-arch-lifecycle-extensions \ + androidx.lifecycle_lifecycle-runtime \ + androidx.lifecycle_lifecycle-extensions \ guava \ jsr305 \ settings-logtags \ diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 61b12a6fb9c..98004f16459 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -106,7 +106,7 @@ android:usesCleartextTraffic="true" android:defaultToDeviceProtectedStorage="true" android:directBootAware="true" - android:appComponentFactory="android.support.v4.app.CoreComponentFactory"> + android:appComponentFactory="androidx.core.app.CoreComponentFactory"> @@ -2806,7 +2806,7 @@ diff --git a/proguard.flags b/proguard.flags index 43a038b78a7..6929d4bdf90 100644 --- a/proguard.flags +++ b/proguard.flags @@ -41,9 +41,9 @@ } # Keep annotated classes or class members. --keep @android.support.annotation.Keep class * +-keep @androidx.annotation.Keep class * -keepclassmembers class * { - @android.support.annotation.Keep *; + @androidx.annotation.Keep *; } # Keep specific fields used via reflection. @@ -51,4 +51,4 @@ public static ** SEARCH_INDEX_DATA_PROVIDER; public static ** SUMMARY_PROVIDER_FACTORY; } --keep class android.support.v4.app.CoreComponentFactory +-keep class androidx.core.app.CoreComponentFactory diff --git a/res/layout/app_preference_item.xml b/res/layout/app_preference_item.xml index 5653920ff6c..85d6bb04bbe 100755 --- a/res/layout/app_preference_item.xml +++ b/res/layout/app_preference_item.xml @@ -33,7 +33,7 @@ android:minWidth="56dp" android:paddingTop="4dp" android:paddingBottom="4dp"> - - diff --git a/res/layout/condition_container.xml b/res/layout/condition_container.xml index dd91bbb8d49..a917ad94652 100644 --- a/res/layout/condition_container.xml +++ b/res/layout/condition_container.xml @@ -26,19 +26,19 @@ android:paddingEnd="16dp" android:paddingBottom="@dimen/dashboard_padding_bottom"> - - - + diff --git a/res/layout/condition_tile.xml b/res/layout/condition_tile.xml index a31274fada6..81b90a5e738 100644 --- a/res/layout/condition_tile.xml +++ b/res/layout/condition_tile.xml @@ -57,7 +57,7 @@ android:alpha=".7" android:textColor="?android:attr/textColorPrimary" /> - - + diff --git a/res/layout/manage_applications_apps.xml b/res/layout/manage_applications_apps.xml index d36252878c3..765ced63652 100644 --- a/res/layout/manage_applications_apps.xml +++ b/res/layout/manage_applications_apps.xml @@ -43,7 +43,7 @@ android:layout_height="0px" android:layout_weight="1"> - - - - - - - + - - - + diff --git a/res/layout/suggestion_tile_two_cards.xml b/res/layout/suggestion_tile_two_cards.xml index 15c5004e5f9..c75458b68b8 100644 --- a/res/layout/suggestion_tile_two_cards.xml +++ b/res/layout/suggestion_tile_two_cards.xml @@ -14,7 +14,7 @@ limitations under the License. --> - - + diff --git a/res/layout/suggestion_tile_with_button.xml b/res/layout/suggestion_tile_with_button.xml index cff05660944..7d59dd9978d 100644 --- a/res/layout/suggestion_tile_with_button.xml +++ b/res/layout/suggestion_tile_with_button.xml @@ -14,7 +14,7 @@ limitations under the License. --> - - + diff --git a/res/layout/time_zone_items_list.xml b/res/layout/time_zone_items_list.xml index 8c9dd9421d6..9c929eed83b 100644 --- a/res/layout/time_zone_items_list.xml +++ b/res/layout/time_zone_items_list.xml @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -must act as the {@link ViewPager.OnPageChangeListener} for the ViewPager - * (as set by {@link #setViewPager(android.support.v4.view.ViewPager)}). Applications may set a + * (as set by {@link #setViewPager(androidx.viewpager.widget.ViewPager)}). Applications may set a * listener here to be notified of the ViewPager events. * * @param onPageChangeListener diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java index c40d4da198f..0f3a8b066fd 100644 --- a/src/com/android/settings/widget/EntityHeaderController.java +++ b/src/com/android/settings/widget/EntityHeaderController.java @@ -31,9 +31,9 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; -import android.support.annotation.IntDef; -import android.support.annotation.VisibleForTesting; -import android.support.v7.widget.RecyclerView; +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; diff --git a/src/com/android/settings/widget/FixedLineSummaryPreference.java b/src/com/android/settings/widget/FixedLineSummaryPreference.java index efc8aa270f1..7187c7b6ee5 100644 --- a/src/com/android/settings/widget/FixedLineSummaryPreference.java +++ b/src/com/android/settings/widget/FixedLineSummaryPreference.java @@ -16,8 +16,8 @@ package com.android.settings.widget; import android.content.Context; import android.content.res.TypedArray; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.text.TextUtils.TruncateAt; import android.util.AttributeSet; import android.widget.TextView; diff --git a/src/com/android/settings/widget/GearPreference.java b/src/com/android/settings/widget/GearPreference.java index 95937989b49..200156b1cdb 100644 --- a/src/com/android/settings/widget/GearPreference.java +++ b/src/com/android/settings/widget/GearPreference.java @@ -17,7 +17,7 @@ package com.android.settings.widget; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; diff --git a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java index d2deda18508..3a5548ea7a3 100644 --- a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java +++ b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java @@ -25,12 +25,12 @@ import android.animation.ValueAnimator; import android.content.Context; import android.graphics.Color; import android.os.Bundle; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.PreferenceGroup; -import android.support.v7.preference.PreferenceGroupAdapter; -import android.support.v7.preference.PreferenceScreen; -import android.support.v7.preference.PreferenceViewHolder; -import android.support.v7.widget.RecyclerView; +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; diff --git a/src/com/android/settings/widget/HotspotApBandSelectionPreference.java b/src/com/android/settings/widget/HotspotApBandSelectionPreference.java index 0a2405e4136..b249b993856 100644 --- a/src/com/android/settings/widget/HotspotApBandSelectionPreference.java +++ b/src/com/android/settings/widget/HotspotApBandSelectionPreference.java @@ -22,7 +22,7 @@ import android.net.wifi.WifiConfiguration; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.view.View; import android.widget.Button; diff --git a/src/com/android/settings/widget/LabeledSeekBar.java b/src/com/android/settings/widget/LabeledSeekBar.java index 8e5a30b6731..7725283e0c4 100644 --- a/src/com/android/settings/widget/LabeledSeekBar.java +++ b/src/com/android/settings/widget/LabeledSeekBar.java @@ -20,9 +20,9 @@ import android.content.Context; import android.content.res.Configuration; import android.graphics.Rect; import android.os.Bundle; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat; -import android.support.v4.widget.ExploreByTouchHelper; +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; diff --git a/src/com/android/settings/widget/MasterCheckBoxPreference.java b/src/com/android/settings/widget/MasterCheckBoxPreference.java index fceeac22f00..8fe59e8b9a9 100644 --- a/src/com/android/settings/widget/MasterCheckBoxPreference.java +++ b/src/com/android/settings/widget/MasterCheckBoxPreference.java @@ -17,7 +17,7 @@ package com.android.settings.widget; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.view.View.OnClickListener; diff --git a/src/com/android/settings/widget/MasterSwitchController.java b/src/com/android/settings/widget/MasterSwitchController.java index a22640c29cd..1244d336515 100644 --- a/src/com/android/settings/widget/MasterSwitchController.java +++ b/src/com/android/settings/widget/MasterSwitchController.java @@ -16,7 +16,7 @@ package com.android.settings.widget; -import android.support.v7.preference.Preference; +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 73774beaa45..765eae1293a 100644 --- a/src/com/android/settings/widget/MasterSwitchPreference.java +++ b/src/com/android/settings/widget/MasterSwitchPreference.java @@ -17,7 +17,7 @@ package com.android.settings.widget; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.view.View.OnClickListener; diff --git a/src/com/android/settings/widget/RadioButtonPickerFragment.java b/src/com/android/settings/widget/RadioButtonPickerFragment.java index 1465c60d6f3..8142d0bc716 100644 --- a/src/com/android/settings/widget/RadioButtonPickerFragment.java +++ b/src/com/android/settings/widget/RadioButtonPickerFragment.java @@ -20,10 +20,10 @@ import android.content.Context; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import android.support.annotation.LayoutRes; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +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; diff --git a/src/com/android/settings/widget/RadioButtonPreference.java b/src/com/android/settings/widget/RadioButtonPreference.java index 2d3068719d6..9b5c1700708 100644 --- a/src/com/android/settings/widget/RadioButtonPreference.java +++ b/src/com/android/settings/widget/RadioButtonPreference.java @@ -17,9 +17,9 @@ package com.android.settings.widget; import android.content.Context; -import android.support.v4.content.res.TypedArrayUtils; -import android.support.v7.preference.CheckBoxPreference; -import android.support.v7.preference.PreferenceViewHolder; +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; @@ -53,7 +53,7 @@ public class RadioButtonPreference extends CheckBoxPreference { public RadioButtonPreference(Context context, AttributeSet attrs) { this(context, attrs, TypedArrayUtils.getAttr(context, - android.support.v7.preference.R.attr.preferenceStyle, + androidx.preference.R.attr.preferenceStyle, android.R.attr.preferenceStyle)); } diff --git a/src/com/android/settings/widget/RestrictedAppPreference.java b/src/com/android/settings/widget/RestrictedAppPreference.java index af6d8d1e0d4..9518c693e30 100644 --- a/src/com/android/settings/widget/RestrictedAppPreference.java +++ b/src/com/android/settings/widget/RestrictedAppPreference.java @@ -18,8 +18,8 @@ package com.android.settings.widget; import android.content.Context; import android.os.UserHandle; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; diff --git a/src/com/android/settings/widget/RtlCompatibleViewPager.java b/src/com/android/settings/widget/RtlCompatibleViewPager.java index f3e4bab6b76..ac28e7bf4cb 100644 --- a/src/com/android/settings/widget/RtlCompatibleViewPager.java +++ b/src/com/android/settings/widget/RtlCompatibleViewPager.java @@ -18,7 +18,7 @@ package com.android.settings.widget; import android.content.Context; import android.os.Parcelable; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; diff --git a/src/com/android/settings/widget/SeekBarPreference.java b/src/com/android/settings/widget/SeekBarPreference.java index 85e08966725..2919b36ce59 100644 --- a/src/com/android/settings/widget/SeekBarPreference.java +++ b/src/com/android/settings/widget/SeekBarPreference.java @@ -20,8 +20,8 @@ import android.content.Context; import android.content.res.TypedArray; import android.os.Parcel; import android.os.Parcelable; -import android.support.v4.content.res.TypedArrayUtils; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.KeyEvent; @@ -78,7 +78,7 @@ public class SeekBarPreference extends RestrictedPreference public SeekBarPreference(Context context, AttributeSet attrs) { this(context, attrs, TypedArrayUtils.getAttr(context, - android.support.v7.preference.R.attr.seekBarPreferenceStyle, + androidx.preference.R.attr.seekBarPreferenceStyle, com.android.internal.R.attr.seekBarPreferenceStyle)); } diff --git a/src/com/android/settings/widget/SlidingTabLayout.java b/src/com/android/settings/widget/SlidingTabLayout.java index 709964640ea..ef024ef5a12 100644 --- a/src/com/android/settings/widget/SlidingTabLayout.java +++ b/src/com/android/settings/widget/SlidingTabLayout.java @@ -17,7 +17,7 @@ package com.android.settings.widget; import android.content.Context; -import android.support.v4.view.PagerAdapter; +import androidx.viewpager.widget.PagerAdapter; import android.util.AttributeSet; import android.view.Gravity; import android.view.LayoutInflater; diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java index 004e89c0ed6..857075bfb5a 100644 --- a/src/com/android/settings/widget/SwitchBar.java +++ b/src/com/android/settings/widget/SwitchBar.java @@ -23,9 +23,9 @@ import android.content.res.TypedArray; import android.graphics.Rect; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.ColorInt; -import android.support.annotation.StringRes; -import android.support.annotation.VisibleForTesting; +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; diff --git a/src/com/android/settings/widget/TwoStateButtonPreference.java b/src/com/android/settings/widget/TwoStateButtonPreference.java index 78d48747b26..0f71268975f 100644 --- a/src/com/android/settings/widget/TwoStateButtonPreference.java +++ b/src/com/android/settings/widget/TwoStateButtonPreference.java @@ -18,8 +18,8 @@ package com.android.settings.widget; import android.content.Context; import android.content.res.TypedArray; -import android.support.annotation.VisibleForTesting; -import android.support.v4.content.res.TypedArrayUtils; +import androidx.annotation.VisibleForTesting; +import androidx.core.content.res.TypedArrayUtils; import android.util.AttributeSet; import android.view.View; import android.widget.Button; diff --git a/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java b/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java index 93697781d9e..0243a6873e8 100644 --- a/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java +++ b/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java @@ -18,9 +18,9 @@ package com.android.settings.widget; import android.app.AlertDialog; import android.content.res.TypedArray; import android.os.Bundle; -import android.support.annotation.VisibleForTesting; -import android.support.v14.preference.PreferenceDialogFragment; -import android.support.v7.preference.ListPreference; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceDialogFragment; +import androidx.preference.ListPreference; import android.widget.ArrayAdapter; import com.android.settingslib.core.instrumentation.Instrumentable; diff --git a/src/com/android/settings/widget/ValidatedEditTextPreference.java b/src/com/android/settings/widget/ValidatedEditTextPreference.java index 707da000f14..8ffffb7f656 100644 --- a/src/com/android/settings/widget/ValidatedEditTextPreference.java +++ b/src/com/android/settings/widget/ValidatedEditTextPreference.java @@ -18,8 +18,8 @@ package com.android.settings.widget; import android.app.AlertDialog; import android.content.Context; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceViewHolder; import android.text.Editable; import android.text.InputType; import android.text.TextUtils; diff --git a/src/com/android/settings/widget/VideoPreference.java b/src/com/android/settings/widget/VideoPreference.java index 03f8f0b4035..4ec98296e1b 100644 --- a/src/com/android/settings/widget/VideoPreference.java +++ b/src/com/android/settings/widget/VideoPreference.java @@ -22,9 +22,9 @@ import android.content.res.TypedArray; import android.graphics.SurfaceTexture; import android.media.MediaPlayer; import android.net.Uri; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.util.Log; import android.view.Surface; diff --git a/src/com/android/settings/widget/WorkOnlyCategory.java b/src/com/android/settings/widget/WorkOnlyCategory.java index 53badb22218..449916b6cfe 100644 --- a/src/com/android/settings/widget/WorkOnlyCategory.java +++ b/src/com/android/settings/widget/WorkOnlyCategory.java @@ -16,7 +16,7 @@ package com.android.settings.widget; import android.content.Context; import android.os.UserManager; -import android.support.v7.preference.PreferenceCategory; +import androidx.preference.PreferenceCategory; import android.util.AttributeSet; import com.android.settings.SelfAvailablePreference; diff --git a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java index 2baf261dd72..2fefb43e7a1 100644 --- a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java +++ b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java @@ -18,8 +18,8 @@ package com.android.settings.wifi; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.Preference; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/wifi/ChangeWifiStateDetails.java b/src/com/android/settings/wifi/ChangeWifiStateDetails.java index 1df11e05039..1c59ddd02b7 100644 --- a/src/com/android/settings/wifi/ChangeWifiStateDetails.java +++ b/src/com/android/settings/wifi/ChangeWifiStateDetails.java @@ -21,9 +21,9 @@ import android.app.AlertDialog; import android.app.AppOpsManager; import android.content.Context; import android.os.Bundle; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java index def48e00e54..1e3723e3570 100644 --- a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java +++ b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java @@ -17,8 +17,8 @@ package com.android.settings.wifi; import android.content.Context; -import android.support.annotation.DrawableRes; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.annotation.DrawableRes; +import androidx.preference.PreferenceViewHolder; import android.view.View; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/LinkablePreference.java b/src/com/android/settings/wifi/LinkablePreference.java index 9a6b11a15c1..e4cb95bcebd 100644 --- a/src/com/android/settings/wifi/LinkablePreference.java +++ b/src/com/android/settings/wifi/LinkablePreference.java @@ -17,9 +17,9 @@ package com.android.settings.wifi; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; +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; diff --git a/src/com/android/settings/wifi/LongPressAccessPointPreference.java b/src/com/android/settings/wifi/LongPressAccessPointPreference.java index 93097db3d25..213589b9de4 100644 --- a/src/com/android/settings/wifi/LongPressAccessPointPreference.java +++ b/src/com/android/settings/wifi/LongPressAccessPointPreference.java @@ -17,7 +17,7 @@ package com.android.settings.wifi; import android.app.Fragment; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.widget.ImageView; import com.android.settings.R; import com.android.settingslib.wifi.AccessPoint; diff --git a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java index 79b7653a328..baf273c21db 100644 --- a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java +++ b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java @@ -22,9 +22,9 @@ import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/wifi/RequestToggleWiFiActivity.java b/src/com/android/settings/wifi/RequestToggleWiFiActivity.java index c641308c8b0..c45db69ba04 100644 --- a/src/com/android/settings/wifi/RequestToggleWiFiActivity.java +++ b/src/com/android/settings/wifi/RequestToggleWiFiActivity.java @@ -26,7 +26,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.net.wifi.WifiManager; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java index 76e4557935a..25c97b203e0 100644 --- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java +++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java @@ -24,9 +24,9 @@ import android.icu.text.Collator; import android.net.wifi.WifiManager; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.util.Log; import android.widget.Toast; diff --git a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java index 5a21bb76e3a..6bc2d98f796 100644 --- a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java +++ b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java @@ -13,10 +13,10 @@ import android.net.Uri; import android.os.Handler; import android.os.Looper; import android.provider.Settings; -import android.support.annotation.VisibleForTesting; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.annotation.VisibleForTesting; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/WifiAPITest.java b/src/com/android/settings/wifi/WifiAPITest.java index 1a5eb15972d..35f700de815 100644 --- a/src/com/android/settings/wifi/WifiAPITest.java +++ b/src/com/android/settings/wifi/WifiAPITest.java @@ -22,8 +22,8 @@ import android.app.AlertDialog; import android.content.DialogInterface; import android.net.wifi.WifiManager; import android.os.Bundle; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.text.Editable; import android.widget.EditText; diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 26e7b5724db..22de20c445c 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -38,7 +38,7 @@ import android.os.Handler; import android.os.UserManager; import android.security.Credentials; import android.security.KeyStore; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.text.Editable; import android.text.InputType; import android.text.TextUtils; diff --git a/src/com/android/settings/wifi/WifiDetailPreference.java b/src/com/android/settings/wifi/WifiDetailPreference.java index b62df56671f..f7ddac7c6fc 100644 --- a/src/com/android/settings/wifi/WifiDetailPreference.java +++ b/src/com/android/settings/wifi/WifiDetailPreference.java @@ -17,8 +17,8 @@ package com.android.settings.wifi; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.widget.TextView; diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java index e2e3d019cd1..02ce0e4d4e8 100644 --- a/src/com/android/settings/wifi/WifiDialogActivity.java +++ b/src/com/android/settings/wifi/WifiDialogActivity.java @@ -24,7 +24,7 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.net.wifi.WifiManager.ActionListener; import android.os.Bundle; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.util.Log; import com.android.settings.SetupWizardUtils; diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java index fc71d742658..018119b3e57 100644 --- a/src/com/android/settings/wifi/WifiEnabler.java +++ b/src/com/android/settings/wifi/WifiEnabler.java @@ -28,7 +28,7 @@ import android.net.wifi.WifiManager; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.widget.Toast; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/wifi/WifiInfoPreferenceController.java b/src/com/android/settings/wifi/WifiInfoPreferenceController.java index c760688321b..ec17b08d121 100644 --- a/src/com/android/settings/wifi/WifiInfoPreferenceController.java +++ b/src/com/android/settings/wifi/WifiInfoPreferenceController.java @@ -23,9 +23,9 @@ import android.content.IntentFilter; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.provider.Settings; -import android.support.v4.text.BidiFormatter; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.core.text.BidiFormatter; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java index 8843d93775a..cbbe8ba2c01 100644 --- a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java +++ b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java @@ -16,7 +16,7 @@ package com.android.settings.wifi; import android.content.Context; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/WifiPickerActivity.java b/src/com/android/settings/wifi/WifiPickerActivity.java index 5d5afd375df..51904418f8f 100644 --- a/src/com/android/settings/wifi/WifiPickerActivity.java +++ b/src/com/android/settings/wifi/WifiPickerActivity.java @@ -16,7 +16,7 @@ package com.android.settings.wifi; import android.content.Intent; -import android.support.v14.preference.PreferenceFragment; +import androidx.preference.PreferenceFragment; import com.android.settings.ButtonBarHandler; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java index d7b6708954a..9db766cb3be 100644 --- a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java +++ b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java @@ -25,7 +25,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.provider.Settings; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 7a7caf47efd..7aeaba65669 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -39,9 +39,9 @@ import android.os.Handler; import android.os.Looper; import android.os.PowerManager; import android.provider.Settings; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceCategory; +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; diff --git a/src/com/android/settings/wifi/WifiSliceBuilder.java b/src/com/android/settings/wifi/WifiSliceBuilder.java index 21a9455ab2c..68aa9a5b8d3 100644 --- a/src/com/android/settings/wifi/WifiSliceBuilder.java +++ b/src/com/android/settings/wifi/WifiSliceBuilder.java @@ -45,7 +45,7 @@ import androidx.slice.Slice; import androidx.slice.builders.ListBuilder; import androidx.slice.builders.SliceAction; -import android.support.v4.graphics.drawable.IconCompat; +import androidx.core.graphics.drawable.IconCompat; import android.text.TextUtils; /** diff --git a/src/com/android/settings/wifi/WifiSummaryUpdater.java b/src/com/android/settings/wifi/WifiSummaryUpdater.java index 6fe3ce94cda..d0b4f606946 100644 --- a/src/com/android/settings/wifi/WifiSummaryUpdater.java +++ b/src/com/android/settings/wifi/WifiSummaryUpdater.java @@ -24,7 +24,7 @@ import android.net.ConnectivityManager; import android.net.NetworkScoreManager; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java index 3eac471c08d..0c088257abb 100644 --- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java +++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java @@ -24,10 +24,10 @@ import android.content.Context; import android.content.Intent; import android.location.LocationManager; import android.provider.Settings; -import android.support.annotation.VisibleForTesting; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.annotation.VisibleForTesting; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettings.java b/src/com/android/settings/wifi/calling/WifiCallingSettings.java index 7bab07a5840..a9c0ee9f54c 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSettings.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSettings.java @@ -19,7 +19,7 @@ package com.android.settings.wifi.calling; import android.app.Fragment; import android.app.FragmentManager; import android.os.Bundle; -import android.support.v13.app.FragmentPagerAdapter; +import androidx.legacy.app.FragmentPagerAdapter; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.util.Log; diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java index 6f170a00a7a..15137cc821a 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java @@ -25,10 +25,10 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; import android.os.PersistableBundle; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.Preference.OnPreferenceClickListener; -import android.support.v7.preference.PreferenceScreen; +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; diff --git a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java index cec8545bfb7..a80e9d03c94 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java @@ -26,7 +26,7 @@ import android.content.Intent; import android.net.Uri; import android.os.PersistableBundle; import android.provider.Settings; -import android.support.v4.graphics.drawable.IconCompat; +import androidx.core.graphics.drawable.IconCompat; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java index 2339e38effa..fda5ce49347 100644 --- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java @@ -40,10 +40,10 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.os.Handler; -import android.support.v4.text.BidiFormatter; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceScreen; +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; diff --git a/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java b/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java index 3a515cc8db7..097a49be3ed 100644 --- a/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java @@ -21,11 +21,11 @@ import android.content.Context; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.provider.Settings; -import android.support.annotation.VisibleForTesting; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.DropDownPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +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; diff --git a/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java b/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java index e77762653f4..fed363d9dc7 100644 --- a/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java +++ b/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java @@ -17,9 +17,9 @@ package com.android.settings.wifi.p2p; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceGroup; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java b/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java index 9ed315815ff..84ce1ee04c6 100644 --- a/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java +++ b/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java @@ -18,8 +18,8 @@ package com.android.settings.wifi.p2p; import android.content.Context; import android.net.wifi.p2p.WifiP2pDevice; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java index a318e6f92b7..5a087e527aa 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java @@ -19,8 +19,8 @@ package com.android.settings.wifi.p2p; import android.content.Context; import android.net.wifi.WifiManager; import android.net.wifi.p2p.WifiP2pDevice; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.widget.ImageView; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPersistentGroup.java b/src/com/android/settings/wifi/p2p/WifiP2pPersistentGroup.java index 520be8eead4..4d2b43364a8 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 android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; +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 2d5e25fe356..78af007bdbd 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java @@ -20,9 +20,9 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.net.wifi.WifiManager; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java index f26564d0047..302981d9d6f 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java @@ -38,8 +38,8 @@ import android.net.wifi.p2p.WifiP2pManager.PeerListListener; import android.net.wifi.p2p.WifiP2pManager.PersistentGroupInfoListener; import android.os.Bundle; import android.os.SystemProperties; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.text.InputFilter; import android.text.TextUtils; import android.util.Log; diff --git a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java index b107777f67f..8dde24bdb47 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java @@ -23,7 +23,7 @@ import android.content.Context; import android.content.res.Resources; import android.icu.text.ListFormatter; import android.net.wifi.WifiConfiguration; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import android.util.Log; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java index 8fdae803bc1..d8c3cfd8a34 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java @@ -18,8 +18,8 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.Preference; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; 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 c41f345ca8e..e689916475d 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java @@ -19,8 +19,8 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java index 055e9781aea..465170a2c46 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java @@ -18,8 +18,8 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.net.wifi.WifiConfiguration; -import android.support.v7.preference.EditTextPreference; -import android.support.v7.preference.Preference; +import androidx.preference.EditTextPreference; +import androidx.preference.Preference; import android.text.TextUtils; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java index 9764a454719..3e0297e741b 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java @@ -24,9 +24,9 @@ import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.provider.Settings; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.text.BidiFormatter; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java index d7cb441fc0c..176573f5846 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java @@ -18,9 +18,9 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.net.wifi.WifiConfiguration; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.EditTextPreference; -import android.support.v7.preference.Preference; +import androidx.annotation.VisibleForTesting; +import androidx.preference.EditTextPreference; +import androidx.preference.Preference; import android.util.Log; import com.android.settings.widget.ValidatedEditTextPreference; diff --git a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java index 08a956bb07d..0f08cbb709a 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java @@ -3,8 +3,8 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.content.res.Resources; import android.net.wifi.WifiConfiguration; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; +import androidx.preference.ListPreference; +import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java index b2b60e044f7..0de74043541 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java @@ -27,7 +27,7 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.os.Bundle; import android.os.UserManager; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.util.Log; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java index 4f7b3ba45c2..554cc0e3202 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java @@ -27,7 +27,7 @@ import android.net.wifi.WifiManager; import android.os.Handler; import android.os.Looper; import android.provider.Settings; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import com.android.settings.datausage.DataSaverBackend; import com.android.settings.widget.SwitchWidgetController; diff --git a/tests/robotests/src/com/android/settings/PrivacySettingsTest.java b/tests/robotests/src/com/android/settings/PrivacySettingsTest.java index 24defa1b769..6ad520a6603 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 android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java index 8178641a4e6..dc1fe2b223d 100644 --- a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java +++ b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java @@ -28,7 +28,7 @@ import android.content.SharedPreferences; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.android.settings.fuelgauge.batterytip.AnomalyConfigJobService; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java index 2e768a6b4f4..a7b91f5fb1f 100644 --- a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java @@ -26,10 +26,10 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.content.Context; import android.os.Bundle; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +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; diff --git a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java index 9352d4bc042..1b717772a6f 100644 --- a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java @@ -18,7 +18,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java index 490a38ee8ac..30debd623d2 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java @@ -27,7 +27,7 @@ import android.content.Context; import android.os.Bundle; import android.os.Vibrator; import android.provider.Settings; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java index 0d67ff2fbe9..aad6454e99f 100644 --- a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.accessibility; import static com.google.common.truth.Truth.assertThat; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java index abb1cf3641a..98b1770668f 100644 --- a/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java @@ -23,7 +23,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java index 8a401d53284..128e33bb351 100644 --- a/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java @@ -27,7 +27,7 @@ import static org.mockito.Mockito.spy; import android.content.Context; import android.content.res.Resources; import android.provider.Settings; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java index aa9efc51f88..dda2ae5e780 100644 --- a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java @@ -21,13 +21,13 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.res.Resources; import android.os.Vibrator; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java index a3fb6892034..c1f54d60524 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java @@ -21,7 +21,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import android.os.Bundle; -import android.support.annotation.XmlRes; +import androidx.annotation.XmlRes; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java index 1424a305c2a..558e074160c 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java @@ -30,7 +30,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; import android.os.UserHandle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.dashboard.DashboardFeatureProviderImpl; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java index d392c723a12..59b0aeeb6ee 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java @@ -16,7 +16,7 @@ package com.android.settings.accounts; -import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME; +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; @@ -24,11 +24,11 @@ import static org.mockito.Mockito.when; import android.accounts.Account; import android.app.Activity; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.os.Bundle; import android.os.UserHandle; -import android.support.v14.preference.PreferenceFragment; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceScreen; import android.widget.TextView; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java index 31375709b1d..1cc0c3a6643 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java @@ -37,10 +37,10 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.os.UserManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceGroup; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +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; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java index aed469b8dcf..4e317d7d8cc 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java @@ -27,7 +27,7 @@ import android.content.Context; import android.content.Intent; import android.content.SyncAdapterType; import android.os.UserHandle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java index 98948a48de3..4e42bc90154 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java @@ -29,11 +29,11 @@ import android.accounts.AuthenticatorDescription; import android.content.Context; import android.content.pm.PackageManager; import android.os.UserHandle; -import android.support.v14.preference.PreferenceFragment; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceGroup; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceFragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAccountManager; diff --git a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java index c4b540b2b94..5db22652de2 100644 --- a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java @@ -29,8 +29,8 @@ import android.content.Intent; import android.content.pm.ResolveInfo; import android.content.pm.UserInfo; import android.os.UserManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.search.SearchIndexableRaw; diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java index f1635ca2a32..56659efb51c 100644 --- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java @@ -38,9 +38,9 @@ import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; import android.os.UserManager; -import android.support.v14.preference.PreferenceFragment; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import android.widget.Button; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java index b97b60d8179..605b8de1558 100644 --- a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java @@ -31,8 +31,8 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.net.Uri; import android.os.UserHandle; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java index 28ff1405ead..581b30015fd 100644 --- a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java @@ -31,7 +31,7 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PermissionGroupInfo; import android.content.pm.PermissionInfo; -import android.support.v7.preference.Preference; +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 5a17b1f8e42..fa426291bc8 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java @@ -5,7 +5,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java index 8e4b34fdff3..ff64a844161 100644 --- a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java @@ -21,8 +21,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; -import android.support.v7.preference.Preference.OnPreferenceClickListener; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java index 6556a882484..2876b62f7dc 100644 --- a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java @@ -41,9 +41,9 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.UserHandle; import android.os.UserManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java index bafb0ba6875..bd8b36e470b 100644 --- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java @@ -21,7 +21,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.datausage.DataSaverBackend; 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 b85464de647..cf423f7a635 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java @@ -40,7 +40,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; import android.os.UserManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; 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 ec6e29ac4fb..e1e115446ae 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java @@ -32,8 +32,8 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.os.BatteryStats; import android.os.Bundle; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; 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 72893b7b2a3..bab73b55a2a 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java @@ -33,7 +33,7 @@ import android.content.pm.ApplicationInfo; import android.net.ConnectivityManager; import android.net.INetworkStatsSession; import android.os.Bundle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; import com.android.settings.datausage.AppDataUsage; 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 553684dfce6..1c8569d1c2f 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java @@ -16,7 +16,7 @@ package com.android.settings.applications.appinfo; -import static android.arch.lifecycle.Lifecycle.Event.ON_START; +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; @@ -28,12 +28,12 @@ import static org.mockito.Mockito.when; import android.app.ActionBar; import android.app.Activity; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.graphics.drawable.Drawable; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; 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 89c66056725..1616c83767a 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java @@ -26,8 +26,8 @@ import static org.mockito.Mockito.when; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.os.Bundle; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; 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 07093480fc6..b640f9f5ce5 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java @@ -35,7 +35,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.UserManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 5298fcd9ff1..1c0d89705da 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java @@ -26,8 +26,8 @@ import android.content.Context; import android.content.Intent; import android.os.UserManager; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.SettingsActivity; import com.android.settings.applications.ProcStatsData; 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 88526dc890b..9678ecb3874 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java @@ -28,8 +28,8 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.notification.AppNotificationSettings; import com.android.settings.notification.NotificationBackend; 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 a42e19fb69c..c18e5213bd5 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java @@ -27,8 +27,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.applications.AppLaunchSettings; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 89ffef0c9f2..505f25ea2e0 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java @@ -27,8 +27,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.SettingsActivity; 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 66b58c8435e..b554a4de0f5 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java @@ -28,7 +28,7 @@ import android.app.Application; import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.ResolveInfo; -import android.support.v7.preference.Preference; +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 cebdd6823c2..76c33cb57cb 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java @@ -28,7 +28,7 @@ import android.app.LoaderManager; import android.content.Context; import android.content.pm.ApplicationInfo; import android.os.Bundle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.applications.AppStorageSettings; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 1fc35c5afa7..f577d1ca1eb 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageInfo; -import android.support.v7.preference.Preference; +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 97007f80262..ae61a51549e 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java @@ -25,8 +25,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.SettingsActivity; 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 4ea011c4ee7..c8f19db21de 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java @@ -27,7 +27,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageInfo; import android.os.UserManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 fba4d763207..ef909070240 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java @@ -24,7 +24,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 ad0a9fe75f7..7c99fd0a609 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java @@ -36,8 +36,8 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.view.Menu; import android.view.MenuItem; 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 47d73233be8..b5b600a1807 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; 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 e6cc831d226..9cdd2eaaa1c 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java @@ -25,8 +25,8 @@ import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.ResolveInfo; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +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/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java index b7498750216..e702cd46143 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java @@ -27,7 +27,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageInfo; import android.os.UserManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 61a01395273..e83fbf861fe 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java @@ -16,7 +16,7 @@ package com.android.settings.applications.assist; -import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME; +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; @@ -24,12 +24,12 @@ import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.support.v7.preference.PreferenceScreen; -import android.support.v7.preference.TwoStatePreference; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; 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 c8c2ca2f6e0..dd4422a7f2e 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java @@ -16,7 +16,7 @@ package com.android.settings.applications.assist; -import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME; +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; @@ -26,13 +26,13 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.support.v7.preference.PreferenceScreen; -import android.support.v7.preference.TwoStatePreference; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; 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 4377c4ff537..93d59420912 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java @@ -26,7 +26,7 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.content.Context; import android.os.UserManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import android.util.Pair; import com.android.internal.logging.nano.MetricsProto; 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 e348d8c6027..97e38a03c4c 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java @@ -24,7 +24,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 289fc469f21..c7156d00e63 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java @@ -25,7 +25,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; import android.provider.Settings; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import android.view.autofill.AutofillManager; import com.android.settings.R; 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 d59cf17b15e..fa2a62c5c59 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java @@ -27,7 +27,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ResolveInfo; import android.os.UserManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 e97e2859321..34869b6d3b3 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java @@ -34,7 +34,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.UserManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.wrapper.PackageManagerWrapper; 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 48664d5eddf..454a5644781 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java @@ -26,7 +26,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.nfc.NfcAdapter; import android.os.UserManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.nfc.PaymentBackend; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 89b7d5e9e31..d4e8a0caced 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java @@ -16,8 +16,8 @@ package com.android.settings.applications.manageapplications; -import static android.support.v7.widget.RecyclerView.SCROLL_STATE_DRAGGING; -import static android.support.v7.widget.RecyclerView.SCROLL_STATE_IDLE; +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; @@ -41,7 +41,7 @@ import android.content.Context; import android.os.Bundle; import android.os.Looper; import android.os.UserManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java index 23c5d44d239..ee05740c0ca 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java @@ -24,7 +24,7 @@ import static org.mockito.Mockito.when; import android.app.backup.BackupManager; import android.content.Context; import android.os.UserManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java index 504b6f184be..0a258bbe78b 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.Intent; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java index 6de0bde8d3e..2f838081b0a 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import android.content.Context; -import android.support.v14.preference.PreferenceFragment; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java index 2fd3f0ed7b3..0c2a381c59b 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java @@ -19,14 +19,14 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.app.Activity; -import android.arch.lifecycle.LifecycleOwner; +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 android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java index 2f77af62f6e..74499483ac0 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java @@ -27,8 +27,8 @@ import android.bluetooth.BluetoothClass; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceCategory; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceCategory; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java index 1c61553af2d..a15d26cc34d 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java @@ -25,8 +25,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java index 607842ae5f9..3ce585ab83c 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java @@ -27,8 +27,8 @@ import static org.mockito.Mockito.when; import android.app.Fragment; import android.app.FragmentTransaction; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java index 51afb445213..c1024c8c3c3 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java @@ -26,7 +26,7 @@ import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; import android.content.Intent; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.SettingsActivity; import com.android.settings.connecteddevice.DevicePreferenceCallback; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java index d9e4e6b6ac2..4bb093c8035 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java @@ -32,7 +32,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.UserManager; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.view.View; import android.widget.Switch; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java index 4335f0570a2..7d2257af0c3 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java @@ -25,7 +25,7 @@ import android.content.pm.PackageManager; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.v7.preference.Preference; +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 ece706d4362..3060734e491 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java @@ -30,7 +30,7 @@ import static org.mockito.Mockito.verify; import android.bluetooth.BluetoothAdapter; import android.content.Context; import android.content.res.Resources; -import android.support.v7.preference.PreferenceGroup; +import androidx.preference.PreferenceGroup; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java index 866756c4853..7a0a05d0cdb 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java @@ -25,7 +25,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.Intent; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java index 97c6bcce8ba..fe705aaeb40 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java @@ -35,7 +35,7 @@ import com.android.settingslib.bluetooth.LocalBluetoothManager; import android.content.Intent; import android.content.res.Resources; -import android.support.v4.graphics.drawable.IconCompat; +import androidx.core.graphics.drawable.IconCompat; 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 3781a75979d..12bcd74c079 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java @@ -27,7 +27,7 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.content.res.Resources; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java index ecf024b2591..c73313d63ff 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java @@ -29,9 +29,9 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java index aeab451cdc8..6d0c9fbc6d6 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java @@ -29,10 +29,10 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageManager; import android.media.AudioManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceGroup; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.bluetooth.AvailableMediaBluetoothDeviceUpdater; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java index 718acb9315d..52715b084df 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java @@ -26,13 +26,13 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.PackageManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceGroup; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater; import com.android.settings.connecteddevice.dock.DockUpdater; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java index 8cad0bfe70d..ba2a697a781 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java @@ -26,7 +26,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import android.text.BidiFormatter; import android.text.TextUtils; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java index 444728a1c4c..36cb1801807 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.connecteddevice; import android.content.Context; import android.content.pm.PackageManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.dashboard.DashboardFragment; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java index 2e40bf5f758..b1d4cd81c27 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java @@ -22,10 +22,10 @@ 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.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.PackageManager; -import android.support.v7.preference.PreferenceManager; +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/UsbDetailsDataRoleControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java index 6f7f4fe926c..716c9776f5c 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java @@ -27,9 +27,9 @@ import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; import android.os.Handler; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 713fd2471d5..989a293fc1d 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java @@ -26,9 +26,9 @@ import android.app.Activity; import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; 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 f54d04726cb..7550b451630 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java @@ -20,13 +20,13 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; -import android.support.v14.preference.PreferenceFragment; +import androidx.preference.PreferenceFragment; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; 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 d4d1abc4551..2bc0ed965af 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,10 @@ import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; import android.os.Handler; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java index ad2dabb1b7b..a1f9bf4e85d 100644 --- a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java @@ -36,9 +36,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceGroup; -import android.support.v7.preference.PreferenceScreen; +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 026906c7a24..16830668a06 100644 --- a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java @@ -25,8 +25,8 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.os.Bundle; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java index 2d598c5f5cd..c60d002237d 100644 --- a/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java @@ -17,7 +17,7 @@ package com.android.settings.core; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import android.support.v7.preference.SeekBarPreference; +import androidx.preference.SeekBarPreference; import com.android.settings.slices.SliceData; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java index 6afb54d748d..beaaa52a82e 100644 --- a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.core; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.SwitchPreference; import com.android.settings.slices.SliceData; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java index ad0b01fb374..1b2f72742d3 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java @@ -33,7 +33,7 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.os.Bundle; import android.service.settings.suggestions.Suggestion; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.util.DisplayMetrics; import android.view.LayoutInflater; import android.view.View; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java index e9ea6544b12..94126da5ff3 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java @@ -26,9 +26,9 @@ import static org.mockito.Mockito.when; import android.app.PendingIntent; import android.service.settings.suggestions.Suggestion; -import android.support.annotation.NonNull; -import android.support.v7.util.DiffUtil; -import android.support.v7.util.ListUpdateCallback; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DiffUtil; +import androidx.recyclerview.widget.ListUpdateCallback; import com.android.settings.dashboard.conditional.AirplaneModeCondition; import com.android.settings.dashboard.conditional.Condition; @@ -278,10 +278,10 @@ public class DashboardDataTest { * the transform data result is equals to {@paramref testResultData} *

* The steps are described below: - * 1. Calculate a {@link android.support.v7.util.DiffUtil.DiffResult} from + * 1. Calculate a {@link androidx.recyclerview.widget.DiffUtil.DiffResult} from * {@paramref baseDashboardData} to {@paramref diffDashboardData} *

- * 2. Dispatch the {@link android.support.v7.util.DiffUtil.DiffResult} calculated from step 1 + * 2. Dispatch the {@link androidx.recyclerview.widget.DiffUtil.DiffResult} calculated from step 1 * into {@link ListUpdateResult} *

* 3. Get result data(a.k.a. baseResultData) from {@link ListUpdateResult} and compare it to diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java index 41d8b18f47c..78d3a09adf5 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java @@ -39,7 +39,7 @@ import android.graphics.drawable.Icon; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java index 2da3f0d9c6d..7638a07f573 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java @@ -29,9 +29,9 @@ import android.content.Context; import android.content.Intent; import android.graphics.drawable.Icon; import android.os.Bundle; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java index 774b62e1d48..7bcd80d6fc8 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java @@ -18,7 +18,7 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.TextView; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java index c4ada03e8a6..189dd6b8f37 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java @@ -29,7 +29,7 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.content.Context; -import android.support.v7.widget.LinearLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; import com.android.settings.dashboard.conditional.ConditionManager; import com.android.settings.dashboard.conditional.FocusRecyclerView; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java index 1d2bf5a1aa5..e7014df7c6a 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 0586d337726..79f01f88dd0 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java @@ -20,7 +20,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java index 5941f2fd922..4f107e583c5 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java @@ -31,8 +31,8 @@ import static org.mockito.Mockito.when; import android.content.pm.PackageManager; import android.net.NetworkPolicyManager; import android.os.Bundle; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import android.util.ArraySet; import android.view.View; diff --git a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java index 30a28e5ab04..40c22c7444c 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java @@ -26,7 +26,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.graphics.drawable.Drawable; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import android.util.ArraySet; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java index 710736da1fe..e4ed8bf9721 100644 --- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java @@ -31,9 +31,9 @@ import android.content.Context; import android.content.DialogInterface; import android.content.SharedPreferences; import android.os.Bundle; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceManager; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; +import androidx.preference.SwitchPreference; import android.util.FeatureFlagUtils; import com.android.settings.core.FeatureFlags; diff --git a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java index b634cb6d17f..dd05b772ea5 100644 --- a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java @@ -20,7 +20,7 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.view.LayoutInflater; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java index cfb601bd37a..e471e6d7629 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java @@ -32,7 +32,7 @@ import android.content.Context; import android.content.Intent; import android.net.ConnectivityManager; import android.net.NetworkTemplate; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java index c666d4e232d..573bc74d037 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java @@ -29,7 +29,7 @@ import android.content.Intent; import android.graphics.Typeface; import android.net.NetworkTemplate; import android.os.Bundle; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.telephony.SubscriptionManager; import android.view.LayoutInflater; import android.view.View; diff --git a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java index 587dbf2f85a..01639d40c0e 100644 --- a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java +++ b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java @@ -30,8 +30,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.ApplicationInfo; import android.os.Process; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java index e6af48a8a8b..8a3f8d34624 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java @@ -21,7 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.content.Intent; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.SwitchPreference; import android.text.format.DateFormat; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java index 8bacbe2fca8..d0bacf7801e 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java @@ -23,7 +23,7 @@ import static org.robolectric.shadow.api.Shadow.extract; import android.content.Context; import android.net.ConnectivityManager; import android.provider.Settings; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; diff --git a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java index c9331adfca7..58862ee2cb2 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Answers.RETURNS_DEEP_STUBS; import android.content.Context; import android.content.Intent; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 a2406466321..de330855f13 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java @@ -16,7 +16,7 @@ package com.android.settings.datetime.timezone; -import android.support.v7.widget.RecyclerView.AdapterDataObserver; +import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 49c468edef0..4b86c503181 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.datetime.timezone; import android.app.Activity; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 26fbe50e0cb..53fe2b6f9e0 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.datetime.timezone; import android.app.Activity; import android.icu.util.TimeZone; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 7a8f267c178..e07d8a687b6 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java @@ -17,7 +17,7 @@ package com.android.settings.datetime.timezone; import android.app.Activity; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 b7b42782873..fc460793863 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.datetime.timezone; import android.app.Activity; import android.icu.util.TimeZone; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java index 3c36e04c99e..948a92725a2 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.datetime.timezone; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.spy; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java index 53d1705f59d..9e72d9896aa 100644 --- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java @@ -6,8 +6,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +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/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java index b11b232cf72..8a8c5a134f5 100644 --- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java @@ -28,7 +28,7 @@ import android.app.FragmentManager; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java index 798927fdaa7..2c0676dd541 100644 --- a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java @@ -25,12 +25,12 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothA2dp; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +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/development/AdbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java index d73093e965c..c91dea9c6e4 100644 --- a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java @@ -25,8 +25,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 c289358919c..24acf7316ba 100644 --- a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 32cc38b5135..e793cbbc1a4 100644 --- a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.RemoteException; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; import android.view.IWindowManager; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java index eeb44f71f89..720c0819301 100644 --- a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 56134403d52..1e2e44eae51 100644 --- a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.when; import android.app.IActivityManager; import android.content.Context; import android.os.RemoteException; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java index 28d6a47b0a1..bf6ed9483cd 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 86f2b686483..3da315a0b64 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 a016865c2f2..5c24bc76f77 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java @@ -21,11 +21,11 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +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/development/BluetoothAudioChannelModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java index 24070654f5a..d1305971dad 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java @@ -21,11 +21,11 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +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/development/BluetoothAudioCodecPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java index faf50199674..4f0815f367e 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java @@ -21,11 +21,11 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +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/development/BluetoothAudioQualityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java index fcf650ea556..168c61aa24d 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java @@ -21,11 +21,11 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +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/development/BluetoothAudioSampleRatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java index b09f37debaf..3c62d2900f0 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java @@ -21,11 +21,11 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +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/development/BluetoothAvrcpVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java index c99d956bc94..6da67ffc8e5 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.os.SystemProperties; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java index 7d73a4b01eb..2bd3b09bfb7 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 811bafe3d02..76eb4ac57b4 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.os.SystemProperties; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java index 06fa99490d4..98c0b8372cb 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 9e0cc49b416..f2593fceeef 100644 --- a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java @@ -27,8 +27,8 @@ import android.content.ContentResolver; import android.content.Context; import android.os.UserManager; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java index 316d7c73791..b61f49ae2f8 100644 --- a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.os.SystemProperties; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 e1f763c5dde..6f7c22414bb 100644 --- a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java @@ -29,8 +29,8 @@ import android.content.Context; import android.hardware.usb.IUsbManager; import android.os.RemoteException; import android.os.SystemProperties; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 c80e318568d..67ba7c4ed33 100644 --- a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 b2a92db2f33..9ddfc4b45e0 100644 --- a/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.when; import android.app.UiModeManager; import android.content.Context; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java index de1753a143a..52ca56e80ba 100644 --- a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; import android.view.ThreadedRenderer; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java index 4d17a019d03..fca76a4860c 100644 --- a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; import android.view.ThreadedRenderer; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java index 30abb9567f9..cddee7f683c 100644 --- a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java index 9f890141335..c2ad6c34615 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java @@ -16,13 +16,13 @@ package com.android.settings.development; -import static android.arch.lifecycle.Lifecycle.Event.ON_START; -import static android.arch.lifecycle.Lifecycle.Event.ON_STOP; +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 android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.UserManager; diff --git a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java index cc5f65ba06d..3e0d118df0a 100644 --- a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 a742988d98c..ae9added789 100644 --- a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java @@ -29,8 +29,8 @@ import android.content.Context; import android.content.om.IOverlayManager; import android.content.om.OverlayInfo; import android.content.pm.PackageManager; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; import android.os.RemoteException; import android.view.DisplayCutout; @@ -164,4 +164,4 @@ public class EmulateDisplayCutoutPreferenceControllerTest { 0 /* priority */, true /* isStatic */); } -} \ No newline at end of file +} diff --git a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java index 97ff30a0cc5..c16f4538b08 100644 --- a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 9fa0249ea15..f3b57306067 100644 --- a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 24caa0b284b..dd16a284be9 100644 --- a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java @@ -28,8 +28,8 @@ import android.content.Context; import android.os.RemoteException; import android.os.SystemProperties; import android.os.storage.IStorageManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +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/development/ForceGpuRenderingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java index 3c4f297b3df..03f874fb2c8 100644 --- a/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 5b9c2a92b78..aceb714cf40 100644 --- a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 66f065b3c1c..7f97adc90c3 100644 --- a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java @@ -27,8 +27,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 81d346c0155..abc1c91b273 100644 --- a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import android.view.ThreadedRenderer; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java index 02edd77fc65..fcf6b898db9 100644 --- a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java @@ -21,8 +21,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.os.SystemProperties; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import android.view.ThreadedRenderer; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java index 42c68145688..db7e54694fd 100644 --- a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java @@ -30,8 +30,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.IBinder; import android.os.RemoteException; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 e0fb7a457bc..4c65431cad8 100644 --- a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java @@ -25,8 +25,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java index 1637b637ca0..3a1cc1976a4 100644 --- a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java @@ -26,8 +26,8 @@ import android.app.IActivityManager; import android.content.Context; import android.os.RemoteException; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 bf1c6a5e7a0..a86e18df3ed 100644 --- a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java @@ -11,8 +11,8 @@ import android.app.backup.IBackupManager; import android.content.Context; import android.os.RemoteException; import android.os.UserManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +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/development/LocalTerminalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java index 629faf5b104..5fd3b219add 100644 --- a/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java @@ -26,8 +26,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageManager; import android.os.UserManager; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 9a843638b1e..d65e830e92f 100644 --- a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java @@ -20,11 +20,11 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.SystemProperties; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +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/development/LogdSizePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java index 8642fca54d2..f552a170643 100644 --- a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java @@ -20,8 +20,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.R; diff --git a/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java index bf90bf08741..481e59869b2 100644 --- a/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.applications.ProcStatsData; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java index 8dbd5bfbebe..ad3345536a2 100644 --- a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 e94e99f1bc7..d3763ae9e7b 100644 --- a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java @@ -16,8 +16,8 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +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/development/NotificationChannelWarningsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java index 417b8d83b1a..e6a2d5ce351 100644 --- a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 7b3d3c3bdb8..ce57fb51ddb 100644 --- a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java @@ -31,7 +31,7 @@ import android.content.Context; import android.content.res.Resources; import android.os.UserManager; import android.service.oemlock.OemLockManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import android.telephony.TelephonyManager; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java index ca68764445f..28f369fec86 100644 --- a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java @@ -16,18 +16,18 @@ package com.android.settings.development; -import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE; -import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME; +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 android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.res.Resources; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java index 2c8ee715214..430e0ddcb19 100644 --- a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 77cedca2aa9..350122650b3 100644 --- a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; import android.view.ThreadedRenderer; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java index c78500d3004..8785cf6a5ec 100644 --- a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 db80080b6b2..8e59b84e5c7 100644 --- a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 c7cf74f0f7d..78387e39e71 100644 --- a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.provider.Settings; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java index 59e82a637ec..d4cb4e03b15 100644 --- a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java @@ -28,8 +28,8 @@ import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +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/development/ShortcutManagerThrottlingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java index 2bc7c80a5c2..46c214740de 100644 --- a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.IShortcutService; import android.os.RemoteException; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 01d3259d396..d373f1c09ad 100644 --- a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 2237195b6ac..c18857acce2 100644 --- a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java @@ -21,8 +21,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.os.SystemProperties; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import android.view.View; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java index 8b1984ed2f8..811550ff92e 100644 --- a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java @@ -30,8 +30,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.IBinder; import android.os.RemoteException; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 2f8a9a20d9b..d7eaecdb682 100644 --- a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 9db36885704..c136a29cb65 100644 --- a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java @@ -26,8 +26,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.provider.Settings; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java index 487dbd321dc..40d439fe6d9 100644 --- a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java @@ -26,7 +26,7 @@ import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; diff --git a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java index b6535f31882..1f0c9c553e5 100644 --- a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.when; import android.os.RemoteException; import android.os.StrictMode; import android.os.SystemProperties; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import android.view.IWindowManager; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java index 4bdf72acee9..895722e6257 100644 --- a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 1c8c2708aab..e5c3e43abbc 100644 --- a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.os.RemoteException; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; import android.view.IWindowManager; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java index c3c90b5d5c2..ba27bfb0b29 100644 --- a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 6cc3f9dec4b..98ff9e4944d 100644 --- a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java @@ -29,7 +29,7 @@ import android.content.Intent; import android.content.pm.ResolveInfo; import android.provider.Settings; import android.provider.Settings.Global; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; diff --git a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java index d394b3f8f5f..b152ea7c734 100644 --- a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java @@ -32,8 +32,8 @@ import android.content.Context; import android.content.Intent; import android.os.RemoteException; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java index fe265891c6e..da12894bcf5 100644 --- a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java @@ -21,8 +21,8 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +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/development/WifiConnectedMacRandomizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java index cbd2e8d0c3c..e09b9d9a0d6 100644 --- a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 e60b98a2af9..528f3abc6c2 100644 --- a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 e03f0a961ba..1359e992fee 100644 --- a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java @@ -21,8 +21,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.net.wifi.WifiManager; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 aad9e4043f0..e2db4f95d55 100644 --- a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.os.RemoteException; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; import android.view.IWindowManager; import com.android.settings.R; 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 2d69b6a547b..5fff256035e 100644 --- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java @@ -16,16 +16,16 @@ package com.android.settings.development.featureflags; -import static android.arch.lifecycle.Lifecycle.Event.ON_START; +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 android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; -import android.support.v7.preference.PreferenceScreen; +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/development/qstile/DevelopmentTilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java index 7165d32d74e..09027050ed7 100644 --- a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java @@ -30,9 +30,9 @@ import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.os.RemoteException; import android.service.quicksettings.TileService; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.internal.statusbar.IStatusBarService; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java index 09fa019e1fc..0011b1534b7 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java @@ -27,14 +27,14 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.app.Fragment; -import android.arch.lifecycle.LifecycleOwner; +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.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.text.BidiFormatter; import com.android.internal.logging.nano.MetricsProto; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java index 5bac790f2db..169554d7110 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java @@ -30,7 +30,7 @@ import android.app.Activity; import android.content.Context; import android.os.Build; import android.os.Bundle; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import android.telephony.TelephonyManager; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java index 460af10c9ad..c91683e00d4 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.when; import android.app.Fragment; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +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/DeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java index 66a50ee04b2..3e4b4e6fe2e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java @@ -29,7 +29,7 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.os.Build; import android.provider.Settings; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.ValidatedEditTextPreference; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java index 3266f8ab6a0..e6b12d73e49 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java @@ -20,8 +20,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java index 7a75cd5cbb0..f1e7f218631 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java @@ -21,8 +21,8 @@ import static org.mockito.Mockito.when; import android.app.Fragment; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java index 3989a6019d8..9207e157201 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java @@ -29,7 +29,7 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import android.telephony.TelephonyManager; import android.util.ArrayMap; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java index 39a639bdf1e..565cdf0d866 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java @@ -25,8 +25,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.telephony.SubscriptionInfo; import android.telephony.TelephonyManager; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java index d9dd0fb85a1..fea58e28810 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java @@ -24,8 +24,8 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java index f2f1972331d..fed2cbef516 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java @@ -27,7 +27,7 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.provider.SearchIndexableResource; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.util.SparseArray; import android.view.View; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java index bec0f7d4a16..34ce2e626e1 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java @@ -19,7 +19,7 @@ import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.widget.ProgressBar; 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 a9451fb63ac..05bbdb14452 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java @@ -26,8 +26,8 @@ import android.app.Fragment; import android.app.FragmentManager; import android.content.Context; import android.os.Build; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 5904046d4cf..c068ac76d5a 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java @@ -29,8 +29,8 @@ import android.app.Fragment; import android.app.FragmentManager; import android.content.Context; import android.os.UserManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.telephony.TelephonyManager; import com.android.settings.R; 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 e942e462ecc..f612e55bb8a 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java @@ -54,7 +54,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.PackageInfo; import android.os.PersistableBundle; 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 964ac899744..8ccce3a2e02 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java @@ -27,8 +27,8 @@ import android.app.Fragment; import android.app.FragmentManager; import android.content.Context; import android.os.UserManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.telephony.TelephonyManager; import com.android.settings.R; 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 79a658a7a9f..dea0e4f881d 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java @@ -31,8 +31,8 @@ import android.content.ContentResolver; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.os.RoSystemProperties; 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 bbe92add084..1935c13a700 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java @@ -27,9 +27,9 @@ import android.content.Context; import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; import android.os.UserManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceGroup; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; import android.util.SparseArray; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 122a0563fdf..a4107f5b186 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java @@ -36,7 +36,7 @@ import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.os.storage.VolumeInfo; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import android.util.SparseArray; import android.view.LayoutInflater; import android.widget.LinearLayout; 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 af38b0dd0bd..c36af1b66d3 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java @@ -28,7 +28,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.storage.VolumeInfo; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.text.format.Formatter; import android.view.LayoutInflater; import android.view.View; 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 7ee62160d46..17ac6a98a05 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java @@ -27,8 +27,8 @@ import android.content.Context; import android.content.Intent; import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.util.SparseArray; import com.android.settings.SettingsActivity; diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java index 5cbed2c7171..77390d34738 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java @@ -29,7 +29,7 @@ import android.content.ContentResolver; import android.content.Context; import android.os.UserHandle; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.SwitchPreference; import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.search.InlinePayload; diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java index e9e497aa282..8d62d2fe5c5 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java index fe3ae76a178..5a31e3b4942 100644 --- a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java @@ -26,7 +26,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.UserHandle; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.SwitchPreference; import com.android.internal.view.RotationPolicy; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java index e29ded0ee30..b758531fb49 100644 --- a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java @@ -29,8 +29,8 @@ import android.content.ContentResolver; import android.content.Context; import android.os.PowerManager; import android.provider.Settings.System; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java index a7016e97f0d..c7b65356c20 100644 --- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.internal.app.ColorDisplayController; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java index 80012148be6..40007759b10 100644 --- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java @@ -26,8 +26,8 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.os.Bundle; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.internal.app.ColorDisplayController; import com.android.internal.logging.nano.MetricsProto; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java index 7b6ecd14edc..a4b0e54362f 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java @@ -21,7 +21,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings.Secure; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import android.view.View; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java index ead9c6fa276..fe6686390b2 100644 --- a/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java @@ -21,7 +21,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java index 83fb3eb4186..ad50c2e18f3 100644 --- a/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java @@ -28,8 +28,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java index 56e9c2d04ea..0a6957d170a 100644 --- a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java @@ -32,7 +32,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; -import android.support.v7.preference.ListPreference; +import androidx.preference.ListPreference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java index ebf6b8bf98e..8aea9900481 100644 --- a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java @@ -21,7 +21,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import android.view.View.OnClickListener; import android.widget.Button; diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java index 9c7008e713a..d6e2e10b567 100644 --- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java @@ -21,7 +21,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.dream.DreamBackend; diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java index 83b7198372d..fa9702b9167 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java @@ -21,7 +21,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import android.text.format.DateUtils; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java index c04c870debd..287d33458d8 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.applications.ApplicationFeatureProvider; diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java index a20da9d21b9..b18bf1c6ad5 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; +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/AlwaysOnVpnManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java index 5455e855198..e1a992621ce 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java @@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java index efb4bc792f2..18797934baa 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.UserInfo; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java index 9b95f12335a..d2b305aa0bb 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java @@ -32,8 +32,8 @@ import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.UserInfo; import android.os.UserManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.ApplicationFeatureProvider; diff --git a/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java index a836fa2c06b..72207d1b497 100644 --- a/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; 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 ff1a963a731..2f31b28693a 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java index fd371c9441b..485ed468539 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java @@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; +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/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java index c785681a9ec..d7d0abd09ae 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.eq; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.applications.ApplicationFeatureProvider; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java index adac1252cff..845f607c308 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; +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/EnterpriseSetDefaultAppsListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java index 109bc9254db..6c5fed04910 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java @@ -21,8 +21,8 @@ import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java index 7fc63b5f43a..b54dc9ae4ee 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java @@ -32,9 +32,9 @@ import android.content.pm.PackageManager; import android.content.pm.UserInfo; import android.content.res.Resources; import android.os.UserHandle; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java index 971b6d846b6..442b56caab9 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java @@ -28,7 +28,7 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.UserInfo; import android.os.UserHandle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.applications.EnterpriseDefaultApps; diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java index d13197aeefb..0ee50cafe56 100644 --- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java @@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; +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/GlobalHttpProxyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java index b1753ece00f..14ae7b4277a 100644 --- a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java index 26e808f8c06..c007d37375e 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java @@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; +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/ManageDeviceAdminPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java index b6813d0bdc9..885e8901cff 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java index 6e5e1a0eb7c..01a3c1e1769 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java @@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.verify; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.FrameLayout; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java index 730b8337fb9..8e94be01b47 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java @@ -29,7 +29,7 @@ import android.content.pm.PackageManager; import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; import android.os.UserManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java index 0be63899785..da4bddbb0a8 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java @@ -41,8 +41,8 @@ import android.graphics.drawable.Drawable; import android.os.BatteryStats; import android.os.Bundle; import android.os.UserHandle; -import android.support.v7.preference.Preference; -import android.support.v7.widget.RecyclerView; +import androidx.preference.Preference; +import androidx.recyclerview.widget.RecyclerView; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java index c66e6aa022b..e8e688d84dc 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.doReturn; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java index 389b7144136..d5f3e2b58a7 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java @@ -32,7 +32,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Build; import android.os.UserManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java index afedd5b0323..a30ddf1cfb7 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.PreferenceGroup; +import androidx.preference.PreferenceGroup; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.FeatureFlagUtils; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java index bf67cb81c99..8f94ffb6412 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java @@ -17,7 +17,7 @@ package com.android.settings.fuelgauge; -import static android.arch.lifecycle.Lifecycle.Event.ON_START; +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; @@ -28,13 +28,13 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.Intent; import android.os.BatteryManager; -import android.support.v14.preference.PreferenceFragment; -import android.support.v7.preference.PreferenceScreen; -import android.support.v7.widget.RecyclerView; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceScreen; +import androidx.recyclerview.widget.RecyclerView; import android.widget.TextView; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java index 2a69d35793d..0da118abc79 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java index dec9c6a3c96..66ea56c641b 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java @@ -25,8 +25,8 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.content.Intent; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.Preference; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; 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 d1357694a36..5913d6b56f6 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java @@ -25,7 +25,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.PowerManager; import android.provider.Settings; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java index 8c259740f51..caaf71e28f6 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java @@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.graphics.drawable.Drawable; import android.graphics.drawable.VectorDrawable; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java index 9b61e5fe131..ffa49d4f253 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java @@ -28,7 +28,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.Bundle; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java index 47a462b73e9..f003a7678c5 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java @@ -29,10 +29,10 @@ import static org.mockito.Mockito.verify; import android.content.Intent; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceGroup; -import android.support.v7.preference.PreferenceManager; +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; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java index bf1e8871ba9..c6f885cc5bf 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java @@ -31,7 +31,7 @@ import android.content.Context; import android.content.Intent; import android.os.UserHandle; import android.os.UserManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java index dc71ed58e0c..c52377f172d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java @@ -30,10 +30,10 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.UserHandle; -import android.support.v7.preference.CheckBoxPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceManager; +import androidx.preference.CheckBoxPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceManager; import android.util.IconDrawableFactory; import android.widget.CheckBox; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java index b1e9f51239b..163b7c5c43d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.doReturn; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.FakeFeatureFactory; 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 0ee94ba3c8e..873b512c66c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java @@ -25,8 +25,8 @@ import static org.mockito.Mockito.when; import android.app.FragmentManager; import android.app.FragmentTransaction; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.SettingsActivity; import com.android.settings.core.InstrumentedPreferenceFragment; 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 763276cc7f6..89c5c0fa509 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java @@ -21,7 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; 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 fd911141388..9457f091dbe 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java @@ -17,7 +17,7 @@ package com.android.settings.fuelgauge.batterysaver; import static com.google.common.truth.Truth.assertThat; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.provider.Settings; 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 641a15f4d13..95c59904b3e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.spy; import android.content.Context; import android.os.PowerManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import android.widget.Button; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 27c3e3a22e6..4623c109555 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.when; import android.app.AppOpsManager; import android.content.Context; import android.provider.Settings; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 ba829b13fd8..ff52a0843ab 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java @@ -29,11 +29,11 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.Bundle; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceGroup; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +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; 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 405e761c030..fa81300bcb6 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,8 +20,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.IdRes; -import android.support.v7.preference.Preference; +import androidx.annotation.IdRes; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java index df40ba58bb3..493e643f496 100644 --- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java @@ -28,9 +28,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.Bundle; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; -import android.support.v7.preference.TwoStatePreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.VideoPreference; diff --git a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java index 08a03724ef3..adee6097fa1 100644 --- a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java @@ -25,7 +25,7 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java index b687b46ea61..833a09d59b0 100644 --- a/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java @@ -36,8 +36,8 @@ import android.content.ContentResolver; import android.content.Context; import android.content.SharedPreferences; import android.provider.Settings; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; +import androidx.preference.ListPreference; +import androidx.preference.Preference; import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java index 3c8f3c48851..ca23fa5e8ce 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java @@ -24,7 +24,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.hardware.input.InputManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import android.view.InputDevice; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java index 1a9f3c874b5..11b3c4bdff0 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import android.view.textservice.SpellCheckerInfo; import android.view.textservice.TextServicesManager; diff --git a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java index 97ae2ecd7c8..c1a963cc678 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java @@ -28,8 +28,8 @@ import android.app.admin.DevicePolicyManager; import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; -import android.support.v4.text.BidiFormatter; -import android.support.v7.preference.Preference; +import androidx.core.text.BidiFormatter; +import androidx.preference.Preference; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java index a60241212cb..9e18e06d220 100644 --- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java +++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java @@ -27,7 +27,7 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.app.admin.DevicePolicyManager; -import android.arch.lifecycle.LifecycleObserver; +import androidx.lifecycle.LifecycleObserver; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java index 9fbbb988357..8b7e8a6db27 100644 --- a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.AssetManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java index 194c778b6f8..1b07f404e51 100644 --- a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.speech.tts.TextToSpeech; import android.speech.tts.TtsEngines; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java index 4b115bf5fc1..c20a83e8c6b 100644 --- a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.language; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.inputmethod.UserDictionaryList; import com.android.settings.inputmethod.UserDictionarySettings; diff --git a/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java index ff25e251976..0e5a9f6ad71 100644 --- a/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.provider.Settings; import android.provider.Settings.Global; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java index f4973c06303..10a313f65ef 100644 --- a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java @@ -30,7 +30,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.ActivityManager; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.Intent; import android.content.pm.UserInfo; diff --git a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java index 2d420f298c0..727e9a7e9bd 100644 --- a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java @@ -25,7 +25,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -37,8 +37,8 @@ import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.location.LocationManager; import android.os.Bundle; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceCategory; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java index 314b8057239..92fbeb9bf99 100644 --- a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java @@ -24,13 +24,13 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +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 android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java index 33c6446beb6..e96dd2fe96b 100644 --- a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java @@ -15,15 +15,15 @@ */ package com.android.settings.location; -import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE; -import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME; +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 android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; @@ -32,8 +32,8 @@ import android.content.IntentFilter; import android.location.LocationManager; import android.provider.Settings; import android.provider.Settings.Secure; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.search.InlineListPayload; diff --git a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java index 099ef7df296..f3958f41d59 100644 --- a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java @@ -25,15 +25,15 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; -import android.arch.lifecycle.LifecycleOwner; +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 android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; diff --git a/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java b/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java index 22928bfee95..5e8180edced 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java @@ -8,7 +8,7 @@ import static org.mockito.Mockito.spy; import android.content.Context; import android.content.res.Resources; -import android.support.v4.graphics.drawable.IconCompat; +import androidx.core.graphics.drawable.IconCompat; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java index 6aa6d51a79d..bd36cfaebcc 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.provider.Settings; diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java index 0b125065aff..9a69ad76a10 100644 --- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java @@ -27,13 +27,13 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.Intent; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceScreen; +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; diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java index 6bd013ed22a..1614a6cc808 100644 --- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java @@ -24,11 +24,11 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.provider.Settings.Secure; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.AppPreference; diff --git a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java index e7a69ea6c61..6279adfc783 100644 --- a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.provider.Settings; import android.provider.Settings.Global; -import android.support.v14.preference.SwitchPreference; +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 3b7f3f725df..2bdad8287a2 100644 --- a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java @@ -21,14 +21,14 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +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 android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java index 2fa9de12a01..e81bd821c44 100644 --- a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java +++ b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java @@ -32,10 +32,10 @@ import android.content.Context; import android.content.res.Resources; import android.database.Cursor; import android.net.Uri; -import android.support.v14.preference.MultiSelectListPreference; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.EditTextPreference; -import android.support.v7.preference.ListPreference; +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; diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java index e404c9a625b..11eea6dc21d 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java @@ -15,8 +15,8 @@ */ package com.android.settings.network; -import static android.arch.lifecycle.Lifecycle.Event.ON_START; -import static android.arch.lifecycle.Lifecycle.Event.ON_STOP; +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; @@ -25,14 +25,14 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.robolectric.shadow.api.Shadow.extract; -import android.arch.lifecycle.LifecycleOwner; +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 android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java index 83ec5f8b7d4..f6e40245177 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java @@ -25,7 +25,7 @@ import android.content.ComponentName; import android.content.Context; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java index 58a2c6a1172..8a47a80c271 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java @@ -28,8 +28,8 @@ import android.content.ComponentName; import android.content.Context; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java index a63645ba059..eff20d34857 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java @@ -16,8 +16,8 @@ package com.android.settings.network; -import static android.arch.lifecycle.Lifecycle.Event.ON_START; -import static android.arch.lifecycle.Lifecycle.Event.ON_STOP; +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; @@ -39,7 +39,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.withSettings; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.ContentResolver; import android.database.ContentObserver; @@ -49,8 +49,8 @@ import android.net.LinkProperties; import android.net.Network; import android.os.Handler; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +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/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java index ac573b4dc17..5bf675e91b0 100644 --- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java @@ -34,7 +34,7 @@ import android.content.IntentFilter; import android.database.ContentObserver; import android.net.ConnectivityManager; import android.provider.Settings; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java index beb522db401..0455d9fbdfa 100644 --- a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java @@ -17,8 +17,8 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; -import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE; -import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME; +import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; +import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; @@ -26,7 +26,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.net.ConnectivityManager; import android.net.IConnectivityManager; @@ -34,8 +34,8 @@ import android.net.NetworkRequest; import android.os.IBinder; import android.os.UserHandle; import android.provider.SettingsSlicesContract; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.internal.net.VpnConfig; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java index 8232afefd5f..0abd428d027 100644 --- a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java @@ -27,7 +27,7 @@ import android.nfc.NfcManager; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; diff --git a/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java b/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java index b6d28d192cb..9e7e4f4df08 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java @@ -21,8 +21,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.nfc.NfcAdapter; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowNfcAdapter; diff --git a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java index 39c7d6cb2ae..4d40b122368 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java index 008d1585705..f65866a4a00 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java @@ -27,8 +27,8 @@ import android.nfc.NfcAdapter; import android.nfc.NfcManager; import android.os.UserManager; import android.provider.Settings; -import android.support.v7.preference.PreferenceScreen; -import android.support.v14.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/AdjustVolumeRestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java index 31b2eb131be..2f383fe3c60 100644 --- a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java @@ -27,7 +27,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.accounts.AccountRestrictionHelper; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java index 0de07892b34..d89897282f2 100644 --- a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java @@ -35,8 +35,8 @@ import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; diff --git a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java index 2a4ef7309b4..84407eb2acc 100644 --- a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java @@ -31,7 +31,7 @@ import android.app.NotificationManager; import android.content.Context; import android.content.Intent; import android.os.UserManager; -import android.support.v7.preference.Preference; +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 ad012505ed3..96dbd623a78 100644 --- a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java @@ -37,8 +37,8 @@ import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; diff --git a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java index 1d3c239549d..68991246ae1 100644 --- a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java @@ -29,9 +29,9 @@ import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; -import android.support.v7.preference.TwoStatePreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; import com.android.settings.search.InlinePayload; import com.android.settings.search.InlineSwitchPayload; diff --git a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java index a171068378c..f2e50e9f6fc 100644 --- a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java index 4e9f00740fc..894ec07a8d5 100644 --- a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java @@ -25,8 +25,8 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 eb01cbbdb10..5f3a616a273 100644 --- a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java @@ -30,7 +30,7 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java index 07b17bfa5e7..8901a5df17c 100644 --- a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java @@ -30,7 +30,7 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; -import android.support.v7.preference.Preference; +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 f6bc1785458..881a307c88c 100644 --- a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java @@ -24,8 +24,8 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.System; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import android.telephony.TelephonyManager; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java index ba612ac2ee8..9f90e268961 100644 --- a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java @@ -35,8 +35,8 @@ import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; diff --git a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java index ba7720ac967..74ace1dd764 100644 --- a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java @@ -26,8 +26,8 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; -import android.support.v7.preference.DropDownPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.DropDownPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java index c242cd0bb05..3afb343f906 100644 --- a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java @@ -25,8 +25,8 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java index 5bfcb400240..0dba467779b 100644 --- a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java @@ -24,8 +24,8 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; -import android.support.v7.preference.DropDownPreference; -import android.support.v7.preference.PreferenceScreen; +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 9a766470836..26f516508bc 100644 --- a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java @@ -31,7 +31,7 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; -import android.support.v14.preference.PreferenceFragment; +import androidx.preference.PreferenceFragment; import android.view.View; import com.android.settings.applications.LayoutPreference; diff --git a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java index 8ece321444f..5557cfd6dfd 100644 --- a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java @@ -34,8 +34,8 @@ import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settings.RestrictedListPreference; diff --git a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java index 66b993e217a..02b85e11cae 100644 --- a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java @@ -36,8 +36,8 @@ import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java index 80780acc336..0d493150f3c 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java @@ -21,8 +21,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java index 4fe384e981b..7eeee98982c 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java @@ -37,7 +37,7 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java index 741362eeee1..e429f9a2928 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java @@ -27,7 +27,7 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java index 0d4e6c46b12..119f5835bba 100644 --- a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java @@ -24,9 +24,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; -import android.support.v7.preference.TwoStatePreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java index 344770341b8..9dd077f092f 100644 --- a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java @@ -40,9 +40,9 @@ import android.content.pm.ResolveInfo; import android.os.UserHandle; import android.os.UserManager; import android.service.notification.NotifyingApp; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java index 4494dd14c5e..c6b055b04b9 100644 --- a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.media.RingtoneManager; -import android.support.v7.preference.Preference; +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 f15e2b7316d..4e91eafe2fe 100644 --- a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java @@ -25,8 +25,8 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.System; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 ec12461b680..38e91a4c9a6 100644 --- a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java @@ -27,7 +27,7 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java index d707f4dc66a..b98a68fadf3 100644 --- a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java @@ -40,8 +40,8 @@ import android.content.Intent; import android.net.Uri; import android.os.UserManager; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.util.AttributeSet; import com.android.settings.SettingsPreferenceFragment; diff --git a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java index 1e2a2d923fc..8dd8f2453ba 100644 --- a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java @@ -26,8 +26,8 @@ import android.content.ContentResolver; import android.content.Context; import android.media.AudioManager; import android.provider.Settings.System; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 d6fd1f40db8..c391c1344ba 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java @@ -25,8 +25,8 @@ import android.content.ContentResolver; import android.content.Context; import android.os.Vibrator; import android.provider.Settings.System; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; 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 de5e2cdd544..82357d8f6bc 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java @@ -30,9 +30,9 @@ import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; -import android.support.v7.preference.TwoStatePreference; +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 fba065c0c37..ce908952a86 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java @@ -35,8 +35,8 @@ import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; import android.os.Vibrator; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java index 8fef5fcacfe..7b9af3e9a34 100644 --- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java @@ -25,8 +25,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java index 1e59fed1a6a..eb6adfc71e9 100644 --- a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java @@ -28,10 +28,10 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserHandle; import android.os.UserManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceScreen; -import android.support.v7.preference.TwoStatePreference; +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; diff --git a/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java index 0993f33d3c2..40dfc4105e7 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; -import android.support.v7.preference.Preference.OnPreferenceChangeListener; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; diff --git a/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java index 13f4fb1e5b0..8c7c32608cb 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java @@ -34,7 +34,7 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java index 75259429d38..4325594ebcf 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java @@ -28,8 +28,8 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +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/ZenModeAutomaticRulesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java index b7f80adebb5..552361a5784 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java @@ -25,8 +25,8 @@ import android.app.Fragment; import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceCategory; +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/ZenModeBehaviorCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java index 70e79198fa2..b3a4b90b098 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java @@ -24,7 +24,7 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java index 502059838c2..0bf82144260 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java @@ -37,8 +37,8 @@ import android.content.Context; import android.provider.Settings; import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig.ZenRule; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.util.ArrayMap; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java index afd9f715931..e30fc71eff1 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java @@ -24,7 +24,7 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java index a56127113a8..d3fab8fdf26 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java @@ -24,7 +24,7 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java index e0245ad03f0..10bd641cfd1 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java @@ -30,8 +30,8 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.view.View; import android.widget.Button; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java index 76c816c8547..8ecc9551feb 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java @@ -29,8 +29,8 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java index 9a94e6c18a7..c03e95b672e 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java @@ -25,8 +25,8 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +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/notification/ZenModeEventsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java index f1c4585e8ec..c0f6768bc68 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java @@ -28,8 +28,8 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +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/ZenModeMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java index db828a296b7..870981468e4 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java @@ -28,8 +28,8 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +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/ZenModeMessagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java index a0cfba3549f..dd4b408e525 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java @@ -28,8 +28,8 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java index 437f4d1201c..3ea4471fadc 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java @@ -27,7 +27,7 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.app.NotificationManager.Policy; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java index af421b8b174..2e7f35cbf59 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java @@ -28,8 +28,8 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +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/ZenModeRepeatCallersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java index 52805b3dd8c..cb79d649f89 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java @@ -28,8 +28,8 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +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/ZenModeSettingsFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java index 2ec75142b2b..fcf54ead814 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java @@ -36,8 +36,8 @@ import android.net.Uri; import android.provider.Settings; import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig.ZenRule; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.util.ArrayMap; import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java index ba5ab82691f..e3ba8033922 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java @@ -29,7 +29,7 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.provider.Settings; -import android.support.v4.graphics.drawable.IconCompat; +import androidx.core.graphics.drawable.IconCompat; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java index 7a45d7f4829..754e66dbfff 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java @@ -29,8 +29,8 @@ import android.app.NotificationManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +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/ZenModeSystemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java index 46dfc6986c3..54d6afec612 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java @@ -31,8 +31,8 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +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/ZenModeVisEffectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java index 29ced0b2ab0..2fb747e4b88 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java @@ -36,8 +36,8 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; import android.content.res.Resources; -import android.support.v7.preference.CheckBoxPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.CheckBoxPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java index 30583883464..a20b7e16d14 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java @@ -41,7 +41,7 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java index 64042a834ef..9f8e91ac7a4 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java @@ -41,7 +41,7 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java index 0f99be83bbf..fd22166563b 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java @@ -40,7 +40,7 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java index 82bd4044423..1b48da80c51 100644 --- a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java @@ -16,15 +16,15 @@ package com.android.settings.print; -import static android.arch.lifecycle.Lifecycle.Event.ON_START; -import static android.arch.lifecycle.Lifecycle.Event.ON_STOP; +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 android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.UserManager; import android.print.PrintJob; diff --git a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java index 1b0549c9fa4..493c166b14e 100644 --- a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java @@ -19,7 +19,7 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java index 2e6b703d2c8..944f9fd4e60 100644 --- a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java @@ -22,7 +22,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.os.UserManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java index 50f26c23fb3..728fda65ab2 100644 --- a/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserHandle; import android.os.UserManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java index 023324c1795..3feb4a92525 100644 --- a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.SwitchPreference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java index f047454e9cf..5568553b7c9 100644 --- a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java @@ -29,9 +29,9 @@ import static org.mockito.Mockito.when; import android.app.FragmentManager; import android.app.FragmentTransaction; import android.content.Context; -import android.support.v14.preference.PreferenceFragment; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java index 0ca41ebeb3b..b41ec461a08 100644 --- a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.UserManager; diff --git a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java index 818dc684f73..e8906cba15e 100644 --- a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java @@ -21,7 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java index 0da3d1395b4..5928587798d 100644 --- a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java @@ -24,8 +24,8 @@ import android.content.ContentResolver; import android.content.Context; import android.os.UserHandle; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java index afca089edda..4a12c5a2397 100644 --- a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java @@ -25,8 +25,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.PersistableBundle; import android.os.UserManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; diff --git a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java index 4e37aa786be..1d65aed2015 100644 --- a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java @@ -26,7 +26,7 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.PackageManager; import android.hardware.fingerprint.FingerprintManager; 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 17e61eeb2e3..fc555c4502a 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java @@ -18,7 +18,7 @@ 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 android.arch.lifecycle.Lifecycle.Event.ON_RESUME; +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; @@ -26,11 +26,11 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.UserManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.FakeFeatureFactory; 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 ca2854e7076..0b5d29d9284 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; import android.content.Context; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.SwitchPreference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 e17e797fb0e..c30c53ebb88 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; import android.content.Context; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.SwitchPreference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; 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 f7d30a12567..eedb2da4c07 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java @@ -21,7 +21,7 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; 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 9bd7064afc6..94298be696d 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java @@ -27,12 +27,12 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; import com.android.internal.widget.LockPatternUtils; import com.android.settings.core.PreferenceControllerMixin; diff --git a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java index 1140aee98fb..748aa0ca302 100644 --- a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java @@ -46,9 +46,9 @@ import android.content.pm.PackageManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.IntentFilter; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import android.util.FeatureFlagUtils; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java index 614bcce0b23..4e67143c084 100644 --- a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java @@ -34,9 +34,9 @@ import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothManager; import android.content.Context; import android.media.AudioManager; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java index 4dd809cc1f6..e1b93016980 100644 --- a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java @@ -36,9 +36,9 @@ import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothManager; import android.content.Context; import android.media.AudioManager; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java index 63df36e1a9b..b44a719624f 100644 --- a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java +++ b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java @@ -12,7 +12,7 @@ import android.app.Activity; import android.content.BroadcastReceiver; import android.content.Context; import android.content.IntentFilter; -import android.support.v4.content.LocalBroadcastManager; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.overlay.SurveyFeatureProvider; diff --git a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java index 1b4c5435e1d..0c26650798a 100644 --- a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java @@ -28,8 +28,8 @@ import android.os.Build; import android.os.Bundle; import android.os.SystemUpdateManager; import android.os.UserManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +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/testutils/ResIdSubject.java b/tests/robotests/src/com/android/settings/testutils/ResIdSubject.java index 2305edbe24e..3803d75c0ca 100644 --- a/tests/robotests/src/com/android/settings/testutils/ResIdSubject.java +++ b/tests/robotests/src/com/android/settings/testutils/ResIdSubject.java @@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertAbout; import static org.robolectric.RuntimeEnvironment.application; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.google.common.truth.ComparableSubject; import com.google.common.truth.FailureStrategy; diff --git a/tests/robotests/src/com/android/settings/testutils/SliceTester.java b/tests/robotests/src/com/android/settings/testutils/SliceTester.java index d5055293361..332617b8a2f 100644 --- a/tests/robotests/src/com/android/settings/testutils/SliceTester.java +++ b/tests/robotests/src/com/android/settings/testutils/SliceTester.java @@ -45,7 +45,7 @@ import androidx.slice.core.SliceAction; import androidx.slice.core.SliceQuery; import androidx.slice.widget.EventInfo; -import android.support.v4.graphics.drawable.IconCompat; +import androidx.core.graphics.drawable.IconCompat; import com.android.settings.Utils; import com.android.settings.slices.SettingsSliceProvider; 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 a1bcd4623d0..b184eb2a49e 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java @@ -14,9 +14,9 @@ import android.content.res.TypedArray; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.support.annotation.ArrayRes; -import android.support.annotation.ColorRes; -import android.support.annotation.Nullable; +import androidx.annotation.ArrayRes; +import androidx.annotation.ColorRes; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.util.SparseArray; import android.util.TypedValue; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBidiFormatter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBidiFormatter.java index 66d7338f9bd..4ca894314a4 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBidiFormatter.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBidiFormatter.java @@ -16,8 +16,8 @@ package com.android.settings.testutils.shadow; -import android.support.v4.text.BidiFormatter; -import android.support.v4.text.TextDirectionHeuristicCompat; +import androidx.core.text.BidiFormatter; +import androidx.core.text.TextDirectionHeuristicCompat; import org.robolectric.annotation.Implements; 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 e349ee36f0f..55c1c45982e 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java @@ -17,7 +17,7 @@ package com.android.settings.testutils.shadow; import android.content.Context; -import android.support.v7.widget.CardView; +import androidx.cardview.widget.CardView; import android.util.AttributeSet; 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 d79e7aaf903..f22c7d6a045 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java @@ -19,7 +19,7 @@ package com.android.settings.testutils.shadow; import android.content.Context; import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Implementation; 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 4f156426b47..c11f79cc4da 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java @@ -18,8 +18,8 @@ package com.android.settings.testutils.shadow; import android.content.Context; import android.content.pm.PackageManager; -import android.support.annotation.NonNull; -import android.support.v4.content.PermissionChecker; +import androidx.annotation.NonNull; +import androidx.core.content.PermissionChecker; import android.text.TextUtils; import org.robolectric.annotation.Implementation; diff --git a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java index 46ee27e44c1..10b2acb9ed0 100644 --- a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java @@ -22,12 +22,12 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.UserInfo; import android.os.UserManager; import android.provider.Settings.Global; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedSwitchPreference; diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java index 03ea115a093..782e94d3976 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java @@ -25,9 +25,9 @@ import android.content.Context; import android.content.DialogInterface; import android.content.pm.UserInfo; import android.os.UserManager; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; 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 d15eae585a6..6247feb16ba 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java @@ -24,8 +24,8 @@ import android.app.Fragment; import android.content.Context; import android.content.pm.UserInfo; import android.os.UserManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java index a39ad9fec4f..82412403c5a 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java @@ -10,7 +10,7 @@ import static org.robolectric.RuntimeEnvironment.application; import android.app.Activity; import android.content.Intent; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java index f964224bc40..6b4df47ea3f 100644 --- a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java @@ -16,8 +16,8 @@ package com.android.settings.widget; -import static android.arch.lifecycle.Lifecycle.Event.ON_START; -import static android.arch.lifecycle.Lifecycle.Event.ON_STOP; +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; @@ -26,8 +26,8 @@ import static org.mockito.Mockito.when; import android.app.ActionBar; import android.app.Activity; -import android.arch.lifecycle.LifecycleOwner; -import android.support.v7.widget.RecyclerView; +import androidx.lifecycle.LifecycleOwner; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java index 78493bfbda7..f34c60baa93 100644 --- a/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java @@ -24,7 +24,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.view.View; import android.widget.Button; diff --git a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java index 33f2b8257e5..9ce63179ccf 100644 --- a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java @@ -19,7 +19,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.view.View; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java index de58307a71e..6cb4f3d0234 100644 --- a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java @@ -19,7 +19,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.view.View; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java index ff10833492b..90470f64a1d 100644 --- a/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java @@ -35,9 +35,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import android.support.v7.preference.R; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.R; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.widget.LinearLayout; @RunWith(SettingsRobolectricTestRunner.class) diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java index cdc17ae9799..3337bd4f8b5 100644 --- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java @@ -36,7 +36,7 @@ import android.content.pm.PackageInfo; import android.content.pm.ResolveInfo; import android.graphics.drawable.ColorDrawable; import android.os.UserHandle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import android.view.LayoutInflater; import android.view.View; import android.widget.ImageButton; diff --git a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java index 94188d866f7..48e918d9de0 100644 --- a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java @@ -20,7 +20,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java index 668907f03fc..d952324a303 100644 --- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java +++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java @@ -29,10 +29,10 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceScreen; -import android.support.v7.preference.PreferenceViewHolder; -import android.support.v7.widget.RecyclerView; +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; diff --git a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java index db40ee91ba2..b21090dacc9 100644 --- a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java @@ -21,8 +21,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; -import android.support.v7.preference.Preference.OnPreferenceChangeListener; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.CheckBox; diff --git a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java index 5456cacc189..f96519a4a1b 100644 --- a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java @@ -21,8 +21,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; -import android.support.v7.preference.Preference.OnPreferenceChangeListener; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java index 77ae38227a9..29cc1796930 100644 --- a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java @@ -25,7 +25,7 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.content.Context; import android.os.UserManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java index 878bae4f1a2..80af1f92bff 100644 --- a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.app.Application; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.view.View; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java index ec128ca1db8..f7c96ed5590 100644 --- a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java +++ b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java @@ -19,7 +19,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; import android.os.Parcelable; -import android.support.v4.view.PagerAdapter; +import androidx.viewpager.widget.PagerAdapter; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java index cd5765452ff..c55ee9f56a9 100644 --- a/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java @@ -19,7 +19,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import android.support.v7.preference.ListPreference; +import androidx.preference.ListPreference; import android.widget.ArrayAdapter; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java index 865422c9354..4e2ec7b2af1 100644 --- a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java @@ -25,7 +25,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.text.InputType; import android.text.TextWatcher; import android.view.View; diff --git a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java index fee7bcc1268..a2f859c6321 100644 --- a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.media.MediaPlayer; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java index 15302880513..5ec598a4a79 100644 --- a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java @@ -19,7 +19,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; diff --git a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java index b8d9479d4d5..de629d83ecc 100644 --- a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.Preference; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; 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 8802e323980..bc99fc24acf 100644 --- a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java @@ -35,8 +35,8 @@ import android.content.Intent; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.Preference; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java index eac6886a7b1..19565f39bfc 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java @@ -16,23 +16,23 @@ package com.android.settings.wifi; -import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE; -import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME; +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 android.arch.lifecycle.LifecycleOwner; +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 android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +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/wifi/WifiMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java index cea86bfeaa2..57ecfd0c37e 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java @@ -31,8 +31,8 @@ import android.net.NetworkRequest; import android.net.NetworkScoreManager; import android.net.wifi.WifiManager; import android.os.Handler; -import android.support.v7.preference.Preference.OnPreferenceChangeListener; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java index 605a661a307..0cd6bee16cf 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java @@ -32,7 +32,7 @@ import com.android.settings.testutils.SliceTester; import android.content.Intent; import android.content.res.Resources; import android.net.wifi.WifiManager; -import android.support.v4.graphics.drawable.IconCompat; +import androidx.core.graphics.drawable.IconCompat; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java index d10b0e53676..38118f58586 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java @@ -28,8 +28,8 @@ import android.app.Fragment; import android.content.Context; import android.location.LocationManager; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.Preference; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; 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 d08f922a450..435882b1790 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java @@ -30,7 +30,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -51,8 +51,8 @@ import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.os.Handler; import android.provider.Settings; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; import android.view.View; import android.view.View.OnClickListener; import android.widget.ImageView; 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 00a4a94e10d..13dc51dcd69 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java @@ -21,7 +21,7 @@ import static org.mockito.Mockito.spy; import android.content.Context; import android.net.wifi.WifiConfiguration; -import android.support.v7.preference.DropDownPreference; +import androidx.preference.DropDownPreference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 f57c7eb2561..41b70e2674c 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java @@ -23,9 +23,9 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 d0f9481e196..9741f4fd735 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java @@ -21,8 +21,8 @@ import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; import android.net.wifi.p2p.WifiP2pDevice; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 86d4957ff4e..fb4ffc354e2 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java @@ -15,8 +15,8 @@ */ package com.android.settings.wifi.p2p; -import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE; -import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME; +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; @@ -24,14 +24,14 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +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 android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +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/wifi/tether/WifiTetherApBandPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java index d9c867cf2a6..4b81b345001 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java @@ -26,7 +26,7 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 c553764b4f2..06373539f2e 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; +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 2de98d96e7a..a790d52aa85 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java @@ -26,7 +26,7 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.ValidatedEditTextPreference; 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 149cd225072..9df86b879b3 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java @@ -16,8 +16,8 @@ package com.android.settings.wifi.tether; -import static android.arch.lifecycle.Lifecycle.Event.ON_START; -import static android.arch.lifecycle.Lifecycle.Event.ON_STOP; +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; @@ -27,7 +27,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleOwner; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; @@ -37,7 +37,7 @@ import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.provider.Settings; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 f5e643dc9e6..bbd57cba34b 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java @@ -26,7 +26,7 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.ValidatedEditTextPreference; 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 4108df448de..86f03e0fdf4 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java @@ -10,8 +10,8 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java b/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java index 17a18890835..8f53d0bf1b7 100644 --- a/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java +++ b/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java @@ -34,7 +34,7 @@ import android.support.test.uiautomator.Direction; import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.UiObject2; import android.support.test.uiautomator.Until; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.widget.Switch; import android.widget.TextView; diff --git a/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java index d4f00497cf0..b1e5ea74507 100644 --- a/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java @@ -35,7 +35,7 @@ import android.content.pm.PackageManager; import android.support.test.InstrumentationRegistry; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; -import android.support.v7.preference.ListPreference; +import androidx.preference.ListPreference; import org.junit.Before; import org.junit.Test; diff --git a/tests/unit/src/com/android/settings/print/PrintJobSettingsActivityTest.java b/tests/unit/src/com/android/settings/print/PrintJobSettingsActivityTest.java index da351e74c0e..8fcd0828bb2 100644 --- a/tests/unit/src/com/android/settings/print/PrintJobSettingsActivityTest.java +++ b/tests/unit/src/com/android/settings/print/PrintJobSettingsActivityTest.java @@ -32,7 +32,7 @@ import android.print.PrintDocumentAdapter; import android.print.PrintDocumentInfo; import android.print.PrintJob; import android.print.PrintManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.support.test.InstrumentationRegistry; import android.support.test.filters.LargeTest; import android.support.test.rule.ActivityTestRule; -- GitLab