From c6d5a0cb6a46238a170298538a9b2f3cfa6ecb52 Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Wed, 22 Aug 2018 15:55:07 +0800 Subject: [PATCH 01/13] SIM status page sync signal strength and service state behavior from systemUI To make behavior consistent in the long run and refactor the code into settingslib and call it from both Settings and SystemUI. Bug: 110973964 Test: run testcase and do manual test - test case as below: 1. Testcase: packages/apps/Settings: -> ALL PASS make RunSettingsRoboTests ROBOTEST_FILTER=SimStatusDialogControllerTest 2. Fake the service state's voice and data value,voice is out of service and data is in-service,and then check service state and signal strength at sim status page -> PASS Change-Id: I4cc454b6b3d4242af4805e2878f9d46ce28649ad --- .../simstatus/SimStatusDialogController.java | 11 ++-- .../SimStatusDialogControllerTest.java | 50 ++++++++++++++++++- 2 files changed, 54 insertions(+), 7 deletions(-) diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java index 121bc03cf08..5a2f9293692 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java @@ -50,6 +50,7 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; +import com.android.settingslib.Utils; import java.util.List; @@ -253,8 +254,8 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O } private void updateServiceState(ServiceState serviceState) { - final int state = serviceState.getState(); - if (state == ServiceState.STATE_OUT_OF_SERVICE || state == ServiceState.STATE_POWER_OFF) { + final int state = Utils.getCombinedServiceState(serviceState); + if (!Utils.isInService(serviceState)) { resetSignalStrength(); } @@ -297,10 +298,8 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O return; } - final int state = getCurrentServiceState().getState(); - - if ((ServiceState.STATE_OUT_OF_SERVICE == state) || - (ServiceState.STATE_POWER_OFF == state)) { + ServiceState serviceState = getCurrentServiceState(); + if (serviceState == null || !Utils.isInService(serviceState)) { return; } 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 606fe075c08..ffc17be7c3e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java @@ -178,7 +178,7 @@ public class SimStatusDialogControllerTest { } @Test - public void initialize_updateDataStateWithPowerOff_shouldUpdateSettingAndResetSignalStrength() { + public void initialize_updateServiceStateWithPowerOff_shouldUpdateTextAndResetSignalStrength() { when(mServiceState.getState()).thenReturn(ServiceState.STATE_POWER_OFF); when(mPersistableBundle.getBoolean( CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true); @@ -190,6 +190,33 @@ public class SimStatusDialogControllerTest { verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, "0"); } + @Test + public void initialize_updateVoiceDataOutOfService_shouldUpdateSettingAndResetSignalStrength() { + when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE); + when(mServiceState.getDataRegState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE); + when(mPersistableBundle.getBoolean( + CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true); + + mController.initialize(); + + final String offServiceText = mContext.getString(R.string.radioInfo_service_out); + verify(mDialog).setText(SERVICE_STATE_VALUE_ID, offServiceText); + verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, "0"); + } + + @Test + public void initialize_updateVoiceOutOfServiceDataInService_shouldUpdateTextToBeInService() { + when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE); + when(mServiceState.getDataRegState()).thenReturn(ServiceState.STATE_IN_SERVICE); + when(mPersistableBundle.getBoolean( + CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true); + + mController.initialize(); + + final String inServiceText = mContext.getString(R.string.radioInfo_service_in); + verify(mDialog).setText(SERVICE_STATE_VALUE_ID, inServiceText); + } + @Test public void initialize_updateSignalStrengthWith50_shouldUpdateSignalStrengthTo50() { final int signalDbm = 50; @@ -206,6 +233,27 @@ public class SimStatusDialogControllerTest { verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString); } + @Test + public void initialize_updateVoiceOutOfServiceDataInService_shouldUpdateSignalStrengthTo50() { + when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE); + when(mServiceState.getDataRegState()).thenReturn(ServiceState.STATE_IN_SERVICE); + when(mPersistableBundle.getBoolean( + CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true); + + final int signalDbm = 50; + final int signalAsu = 50; + doReturn(signalDbm).when(mController).getDbm(mSignalStrength); + doReturn(signalAsu).when(mController).getAsuLevel(mSignalStrength); + when(mPersistableBundle.getBoolean( + CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true); + + mController.initialize(); + + final String signalStrengthString = + mContext.getString(R.string.sim_signal_strength, signalDbm, signalAsu); + verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString); + } + @Test public void initialize_updateVoiceNetworkTypeWithEdge_shouldUpdateSettingToEdge() { when(mTelephonyManager.getVoiceNetworkType(anyInt())).thenReturn( From a290b873d05c64ebdd9aeff8ffccf0a6dcbffc89 Mon Sep 17 00:00:00 2001 From: Aurimas Liutikas Date: Tue, 17 Apr 2018 11:22:43 -0700 Subject: [PATCH 02/13] Migrate Settings to androidx. Test: make Settings Bug: 76692459 Change-Id: I941dea40562170649bf056e675cc32e5163c0e39 Merged-In: I941dea40562170649bf056e675cc32e5163c0e39 --- 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 | 6 ++--- .../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 ++++----- .../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 | 6 ++--- ...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 | 4 +-- ...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 | 4 +-- ...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 +- 1189 files changed, 2368 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 f3323ed9890..e4b06767d0c 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"> @@ -2821,7 +2821,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/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 1eda72d7bae..2071075903e 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java @@ -19,9 +19,9 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.content.res.Resources; import android.net.wifi.WifiConfiguration; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; +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 d04b206c6dd..c449fab5475 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.connecteddevice.dock.DockUpdater; 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 a01d33a75bb..68a0ffdd853 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 static org.mockito.Mockito.when; import android.content.Context; 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.view.DisplayCutout; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 6a059b35980..47cdd35f6f6 100644 --- a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java @@ -29,7 +29,7 @@ import android.content.Context; import android.content.pm.ApplicationInfo; 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; import com.android.settings.testutils.FakeFeatureFactory; 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 8bbb334cc1a..9ca61a43d7d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java @@ -33,7 +33,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 0c0cd4c9630..43367fe9a15 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 bd11a159ba0..ebcf4c1634b 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 c9a9c0040ec..e007f60c222 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java @@ -27,8 +27,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.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 586c4486846..56552132515 100644 --- a/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java @@ -33,7 +33,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 com.android.settings.wrapper.OverlayManagerWrapper; 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; From be2370db13d77b1d33e1b07cdef87d5fa980ba86 Mon Sep 17 00:00:00 2001 From: Christine Franks Date: Mon, 27 Aug 2018 15:42:58 -0700 Subject: [PATCH 03/13] Remove demo restrictions These are now available as user restrictions. Bug: 113298946 Test: make RunSettingsRoboTests -j100 Change-Id: I637083c8edcf43b99cebbf5a7dfd60afee441ade --- src/com/android/settings/DateTimeSettings.java | 4 ---- src/com/android/settings/SettingsActivity.java | 10 ---------- 2 files changed, 14 deletions(-) diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java index bf4299bc7c0..149deb15282 100644 --- a/src/com/android/settings/DateTimeSettings.java +++ b/src/com/android/settings/DateTimeSettings.java @@ -186,10 +186,6 @@ public class DateTimeSettings extends DashboardFragment implements public List getXmlResourcesToIndex( Context context, boolean enabled) { List result = new ArrayList<>(); - // Remove data/time settings from search in demo mode - if (UserManager.isDeviceInDemoMode(context)) { - return result; - } SearchIndexableResource sir = new SearchIndexableResource(context); sir.xmlResId = R.xml.date_time_prefs; diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index d268eb67d33..4ca1c2cb688 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -688,16 +688,6 @@ public class SettingsActivity extends SettingsBaseActivity && !Utils.isMonkeyRunning(), isAdmin) || somethingChanged; - somethingChanged = setTileEnabled(changedList, new ComponentName(packageName, - Settings.NetworkDashboardActivity.class.getName()), - !UserManager.isDeviceInDemoMode(this), isAdmin) - || somethingChanged; - - somethingChanged = setTileEnabled(changedList, new ComponentName(packageName, - Settings.DateTimeSettingsActivity.class.getName()), - !UserManager.isDeviceInDemoMode(this), isAdmin) - || somethingChanged; - final boolean showDev = DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(this) && !Utils.isMonkeyRunning(); somethingChanged = setTileEnabled(changedList, new ComponentName(packageName, From 8f7092a15ef49c22ff8c5566fad7fcf89101e02a Mon Sep 17 00:00:00 2001 From: Ash_Chen Date: Fri, 17 Aug 2018 22:31:41 +0800 Subject: [PATCH 04/13] Show bonded devices in "Pair new device"(2/2) Some users forgot they had paired devices and couldn't see their BT device when they search device in "Pair new device". (b/80382940, b/80133137). Need to change the behavior to let paired devices can be shown on "Available devices". Bug: 111738593 Test: Bluetooth Pairing Test Change-Id: Ib499785abaa8e4efc1875be113ac87bdbe0c89ba --- .../bluetooth/BluetoothPairingDetail.java | 13 ++++++- .../DeviceListPreferenceFragment.java | 2 ++ .../bluetooth/BluetoothPairingDetailTest.java | 36 ++++++++++++++----- 3 files changed, 41 insertions(+), 10 deletions(-) diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java index 905327d54a8..736651a2b36 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java @@ -152,7 +152,7 @@ public class BluetoothPairingDetail extends DeviceListPreferenceFragment impleme addDeviceCategory(mAvailableDevicesCategory, R.string.bluetooth_preference_found_media_devices, - BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER, mInitialScanStarted); + BluetoothDeviceFilter.ALL_FILTER, mInitialScanStarted); updateFooterPreference(mFooterPreference); mAlwaysDiscoverable.start(); enableScanning(); @@ -190,6 +190,17 @@ public class BluetoothPairingDetail extends DeviceListPreferenceFragment impleme } } + @Override + public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) { + if (mSelectedDevice != null) { + BluetoothDevice device = cachedDevice.getDevice(); + if (device != null && mSelectedDevice.equals(device) + && state == BluetoothAdapter.STATE_CONNECTED) { + finish(); + } + } + } + @Override public int getHelpResource() { return R.string.help_url_bluetooth; diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java index 46d649ab405..407c2a619d4 100644 --- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java +++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java @@ -192,6 +192,8 @@ public abstract class DeviceListPreferenceFragment extends preference = new BluetoothDevicePreference(getPrefContext(), cachedDevice, mShowDevicesWithoutNames); preference.setKey(key); + //Set hideSecondTarget is true if it's bonded device. + preference.hideSecondTarget(true); mDeviceListGroup.addPreference(preference); } else { // Tell the preference it is being re-used in case there is new info in the diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java index 649184350b3..a56cf7fdb5a 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java @@ -28,6 +28,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import android.bluetooth.BluetoothAdapter; +import android.bluetooth.BluetoothDevice; import android.content.Context; import android.content.res.Resources; @@ -35,6 +36,7 @@ import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settingslib.bluetooth.BluetoothDeviceFilter; +import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.widget.FooterPreference; @@ -53,6 +55,7 @@ import androidx.preference.PreferenceGroup; @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class BluetoothPairingDetailTest { + private static final String TEST_DEVICE_ADDRESS = "00:A1:A1:A1:A1:A1"; @Mock private Resources mResource; @@ -60,12 +63,15 @@ public class BluetoothPairingDetailTest { private LocalBluetoothManager mLocalManager; @Mock private PreferenceGroup mPreferenceGroup; + @Mock + private CachedBluetoothDevice mCachedBluetoothDevice; private BluetoothPairingDetail mFragment; private Context mContext; private BluetoothProgressCategory mAvailableDevicesCategory; private FooterPreference mFooterPreference; private BluetoothAdapter mBluetoothAdapter; private ShadowBluetoothAdapter mShadowBluetoothAdapter; + private BluetoothDevice mBluetoothDevice; @Before public void setUp() { @@ -80,6 +86,7 @@ public class BluetoothPairingDetailTest { mFooterPreference = new FooterPreference(mContext); mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter()); + mBluetoothDevice = mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS); mFragment.mBluetoothAdapter = mBluetoothAdapter; mFragment.mLocalManager = mLocalManager; @@ -88,7 +95,7 @@ public class BluetoothPairingDetailTest { } @Test - public void testInitPreferencesFromPreferenceScreen_findPreferences() { + public void initPreferencesFromPreferenceScreen_findPreferences() { doReturn(mAvailableDevicesCategory).when(mFragment) .findPreference(BluetoothPairingDetail.KEY_AVAIL_DEVICES); doReturn(mFooterPreference).when(mFragment) @@ -101,7 +108,7 @@ public class BluetoothPairingDetailTest { } @Test - public void testStartScanning_startScanAndRemoveDevices() { + public void startScanning_startScanAndRemoveDevices() { mFragment.mAvailableDevicesCategory = mAvailableDevicesCategory; mFragment.mDeviceListGroup = mAvailableDevicesCategory; @@ -112,7 +119,7 @@ public class BluetoothPairingDetailTest { } @Test - public void testUpdateContent_stateOn_addDevices() { + public void updateContent_stateOn_addDevices() { mFragment.mAvailableDevicesCategory = mAvailableDevicesCategory; mFragment.mFooterPreference = mFooterPreference; doNothing().when(mFragment).addDeviceCategory(any(), anyInt(), any(), anyBoolean()); @@ -121,20 +128,20 @@ public class BluetoothPairingDetailTest { verify(mFragment).addDeviceCategory(mAvailableDevicesCategory, R.string.bluetooth_preference_found_media_devices, - BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER, false); + BluetoothDeviceFilter.ALL_FILTER, false); assertThat(mBluetoothAdapter.getScanMode()) .isEqualTo(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE); } @Test - public void testUpdateContent_stateOff_finish() { + public void updateContent_stateOff_finish() { mFragment.updateContent(BluetoothAdapter.STATE_OFF); verify(mFragment).finish(); } @Test - public void testUpdateBluetooth_bluetoothOff_turnOnBluetooth() { + public void updateBluetooth_bluetoothOff_turnOnBluetooth() { mShadowBluetoothAdapter.setEnabled(false); mFragment.updateBluetooth(); @@ -143,7 +150,7 @@ public class BluetoothPairingDetailTest { } @Test - public void testUpdateBluetooth_bluetoothOn_updateState() { + public void updateBluetooth_bluetoothOn_updateState() { mShadowBluetoothAdapter.setEnabled(true); doNothing().when(mFragment).updateContent(anyInt()); @@ -153,7 +160,7 @@ public class BluetoothPairingDetailTest { } @Test - public void testOnScanningStateChanged_restartScanAfterInitialScanning() { + public void onScanningStateChanged_restartScanAfterInitialScanning() { mFragment.mAvailableDevicesCategory = mAvailableDevicesCategory; mFragment.mFooterPreference = mFooterPreference; mFragment.mDeviceListGroup = mAvailableDevicesCategory; @@ -208,4 +215,15 @@ public class BluetoothPairingDetailTest { verify(mFragment).showBluetoothTurnedOnToast(); } -} + + @Test + public void onConnectionStateChanged_connected_finish() { + mFragment.mSelectedDevice = mBluetoothDevice; + doReturn(mBluetoothDevice).when(mCachedBluetoothDevice).getDevice(); + + mFragment.onConnectionStateChanged(mCachedBluetoothDevice, + BluetoothAdapter.STATE_CONNECTED); + + verify(mFragment).finish(); + } +} \ No newline at end of file From fb80ec21c2c5c4e7947eac4582f750c85156a4b7 Mon Sep 17 00:00:00 2001 From: Sunny Shao Date: Mon, 27 Aug 2018 16:58:39 +0800 Subject: [PATCH 05/13] Updated the CardContentProvider - Removed the availability_uri field - Changed the card_action data type to integer - Added the support_half_width field - Modify the Database version to 2 Bug: 111820446 Test: robotest Change-Id: I755ad93a05034037bab18e709f53b4af3ce4fe5e --- .../settings/homepage/CardDatabaseHelper.java | 25 +++++++++++-------- .../settings/homepage/HomepageCard.java | 8 +++--- .../homepage/CardDatabaseHelperTest.java | 2 +- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/com/android/settings/homepage/CardDatabaseHelper.java b/src/com/android/settings/homepage/CardDatabaseHelper.java index b4dc221d39b..382b71f7919 100644 --- a/src/com/android/settings/homepage/CardDatabaseHelper.java +++ b/src/com/android/settings/homepage/CardDatabaseHelper.java @@ -19,6 +19,7 @@ package com.android.settings.homepage; import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; +import android.util.Log; import androidx.annotation.VisibleForTesting; @@ -26,8 +27,9 @@ import androidx.annotation.VisibleForTesting; * Defines the schema for the Homepage Cards database. */ public class CardDatabaseHelper extends SQLiteOpenHelper { + private static final String TAG = "CardDatabaseHelper"; private static final String DATABASE_NAME = "homepage_cards.db"; - private static final int DATABASE_VERSION = 1; + private static final int DATABASE_VERSION = 2; public static final String CARD_TABLE = "cards"; @@ -57,11 +59,6 @@ public class CardDatabaseHelper extends SQLiteOpenHelper { */ String CATEGORY = "category"; - /** - * URI decides the card can be shown. - */ - String AVAILABILITY_URI = "availability_uri"; - /** * Keep the card last display's locale. */ @@ -108,7 +105,7 @@ public class CardDatabaseHelper extends SQLiteOpenHelper { String ICON_RES_ID = "icon_res_id"; /** - * PendingIntent for for custom view card candidate. Do action when user press card. + * Key value mapping to Intent in Settings. Do action when user presses card. */ String CARD_ACTION = "card_action"; @@ -116,6 +113,11 @@ public class CardDatabaseHelper extends SQLiteOpenHelper { * Expire time of the card. The unit of the value is mini-second. */ String EXPIRE_TIME_MS = "expire_time_ms"; + + /** + * Decide the card display full-length width or half-width in screen. + */ + String SUPPORT_HALF_WIDTH = "support_half_width"; } private static final String CREATE_CARD_TABLE = @@ -135,8 +137,6 @@ public class CardDatabaseHelper extends SQLiteOpenHelper { " >= 0 AND " + CardColumns.CATEGORY + " <= 3), " + - CardColumns.AVAILABILITY_URI + - " TEXT, " + CardColumns.LOCALIZED_TO_LOCALE + " TEXT, " + CardColumns.PACKAGE_NAME + @@ -156,9 +156,11 @@ public class CardDatabaseHelper extends SQLiteOpenHelper { CardColumns.ICON_RES_ID + " INTEGER DEFAULT 0, " + CardColumns.CARD_ACTION + - " TEXT, " + + " INTEGER, " + CardColumns.EXPIRE_TIME_MS + - " INTEGER " + + " INTEGER, " + + CardColumns.SUPPORT_HALF_WIDTH + + " INTEGER DEFAULT 0 " + ");"; public CardDatabaseHelper(Context context) { @@ -173,6 +175,7 @@ public class CardDatabaseHelper extends SQLiteOpenHelper { @Override public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { if (oldVersion < newVersion) { + Log.d(TAG, "Reconstructing DB from " + oldVersion + " to " + newVersion); db.execSQL("DROP TABLE IF EXISTS " + CARD_TABLE); onCreate(db); } diff --git a/src/com/android/settings/homepage/HomepageCard.java b/src/com/android/settings/homepage/HomepageCard.java index 1719f57869a..1373297ace2 100644 --- a/src/com/android/settings/homepage/HomepageCard.java +++ b/src/com/android/settings/homepage/HomepageCard.java @@ -56,7 +56,7 @@ public class HomepageCard { private final String mSummaryText; private final String mIconResName; private final int mIconResId; - private final String mCardAction; + private final int mCardAction; private final long mExpireTimeMS; private final Drawable mDrawable; private final boolean mSupportHalfWidth; @@ -121,7 +121,7 @@ public class HomepageCard { return mIconResId; } - String getCardAction() { + int getCardAction() { return mCardAction; } @@ -194,7 +194,7 @@ public class HomepageCard { private String mSummaryText; private String mIconResName; private int mIconResId; - private String mCardAction; + private int mCardAction; private long mExpireTimeMS; private Drawable mDrawable; private boolean mSupportHalfWidth; @@ -269,7 +269,7 @@ public class HomepageCard { return this; } - public Builder setCardAction(String cardAction) { + public Builder setCardAction(int cardAction) { mCardAction = cardAction; return this; } diff --git a/tests/robotests/src/com/android/settings/homepage/CardDatabaseHelperTest.java b/tests/robotests/src/com/android/settings/homepage/CardDatabaseHelperTest.java index b6ed358a5d5..6a17a257100 100644 --- a/tests/robotests/src/com/android/settings/homepage/CardDatabaseHelperTest.java +++ b/tests/robotests/src/com/android/settings/homepage/CardDatabaseHelperTest.java @@ -63,7 +63,6 @@ public class CardDatabaseHelperTest { CardDatabaseHelper.CardColumns.SCORE, CardDatabaseHelper.CardColumns.SLICE_URI, CardDatabaseHelper.CardColumns.CATEGORY, - CardDatabaseHelper.CardColumns.AVAILABILITY_URI, CardDatabaseHelper.CardColumns.LOCALIZED_TO_LOCALE, CardDatabaseHelper.CardColumns.PACKAGE_NAME, CardDatabaseHelper.CardColumns.APP_VERSION, @@ -75,6 +74,7 @@ public class CardDatabaseHelperTest { CardDatabaseHelper.CardColumns.ICON_RES_ID, CardDatabaseHelper.CardColumns.CARD_ACTION, CardDatabaseHelper.CardColumns.EXPIRE_TIME_MS, + CardDatabaseHelper.CardColumns.SUPPORT_HALF_WIDTH, }; assertThat(columnNames).isEqualTo(expectedNames); From ae9059174981c1d100363d184bccfc354392ee05 Mon Sep 17 00:00:00 2001 From: Emily Chuang Date: Tue, 28 Aug 2018 18:25:20 +0800 Subject: [PATCH 06/13] Clean up the main architecture of Contextual Settings Homepage. - Add lifecycle observer in HomepageManager. - Rename some variables. Bug: 111676964 Test: robotests Change-Id: Ic91c53f2c1622d602b3edc664a06a13aa6945f47 --- .../settings/homepage/HomepageAdapter.java | 6 ++- .../settings/homepage/HomepageCard.java | 42 +++++++++---------- .../homepage/HomepageCardController.java | 5 +-- .../homepage/HomepageCardLookupTable.java | 2 - .../settings/homepage/HomepageManager.java | 7 +++- 5 files changed, 32 insertions(+), 30 deletions(-) diff --git a/src/com/android/settings/homepage/HomepageAdapter.java b/src/com/android/settings/homepage/HomepageAdapter.java index b44288337d4..9ff52603dab 100644 --- a/src/com/android/settings/homepage/HomepageAdapter.java +++ b/src/com/android/settings/homepage/HomepageAdapter.java @@ -56,7 +56,8 @@ public class HomepageAdapter extends RecyclerView.Adapter LOOKUP_TABLE = new TreeSet() { - { //add(new HomepageMapping(CardType.CONDITIONAL, ConditionHomepageCardController.class, // ConditionHomepageCardRenderer.class)); - } }; public static Class getCardControllerClass( diff --git a/src/com/android/settings/homepage/HomepageManager.java b/src/com/android/settings/homepage/HomepageManager.java index cbd5841d2cf..61d7ce7c713 100644 --- a/src/com/android/settings/homepage/HomepageManager.java +++ b/src/com/android/settings/homepage/HomepageManager.java @@ -20,6 +20,7 @@ import android.content.Context; import android.widget.BaseAdapter; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; import java.util.ArrayList; import java.util.List; @@ -82,7 +83,11 @@ public class HomepageManager implements CardContentLoader.CardContentLoaderListe cardType); if (controller != null) { controller.setHomepageCardUpdateListener(this); - controller.setLifecycle(mLifecycle); + if (controller instanceof LifecycleObserver) { + if (mLifecycle != null) { + mLifecycle.addObserver((LifecycleObserver) controller); + } + } } } From 516f6dd0d39dba64c487161b9d109adcc6286e49 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Mon, 27 Aug 2018 14:28:54 -0700 Subject: [PATCH 07/13] DO NOT MERGE Fix color_lint errors Test: repo upload Change-Id: I83abb69123e1365cf90db2ab0f60c3a6330f2828 --- color-check-baseline.xml | 72 +++++++++++++++++++++++++++++++++------- 1 file changed, 60 insertions(+), 12 deletions(-) diff --git a/color-check-baseline.xml b/color-check-baseline.xml index 7ce4da7f9d4..1ba1cf54aa0 100644 --- a/color-check-baseline.xml +++ b/color-check-baseline.xml @@ -2141,7 +2141,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2157,7 +2157,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2173,7 +2173,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2189,7 +2189,55 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + + + + + + + + + + + + @@ -2429,7 +2477,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -2444,8 +2492,8 @@ errorLine1=" <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are."</string>" errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -2460,8 +2508,8 @@ errorLine1=" <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are."</string>" errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -2477,7 +2525,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -2493,7 +2541,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -2509,7 +2557,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> From 35ed23e8bf00074983ce8bdeedd2214be8afae7e Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Tue, 28 Aug 2018 10:26:19 -0700 Subject: [PATCH 08/13] Remove unneeded getDisplayableCards() in DashboardAdapter It will be called when window gets focus, no need to call it here. Change-Id: I1c4b3b745edb2519e778f8354684d90e2eb55004 Fixes: 113175600 Test: manual --- src/com/android/settings/dashboard/DashboardAdapter.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java index 5e2e57da18d..307f6ba93c0 100644 --- a/src/com/android/settings/dashboard/DashboardAdapter.java +++ b/src/com/android/settings/dashboard/DashboardAdapter.java @@ -115,8 +115,6 @@ public class DashboardAdapter extends RecyclerView.Adapter Date: Tue, 17 Apr 2018 11:22:43 -0700 Subject: [PATCH 09/13] Migrate Settings to androidx. Test: make Settings Bug: 76692459 Change-Id: I941dea40562170649bf056e675cc32e5163c0e39 Merged-In: I941dea40562170649bf056e675cc32e5163c0e39 (cherry picked from commit a290b873d05c64ebdd9aeff8ffccf0a6dcbffc89) --- 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 | 6 ++--- .../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 ++++----- .../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 | 6 ++--- ...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 | 4 +-- ...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 | 4 +-- ...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 +- 1189 files changed, 2368 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 4e6a25edb16..02f3a8c1b37 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"> @@ -2821,7 +2821,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/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 1eda72d7bae..2071075903e 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java @@ -19,9 +19,9 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.content.res.Resources; import android.net.wifi.WifiConfiguration; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; +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 d04b206c6dd..c449fab5475 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.connecteddevice.dock.DockUpdater; 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 73c976c70bb..34a0581e582 100644 --- a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java @@ -27,8 +27,8 @@ import static org.mockito.Mockito.when; import android.content.Context; 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.view.DisplayCutout; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 6a059b35980..47cdd35f6f6 100644 --- a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java @@ -29,7 +29,7 @@ import android.content.Context; import android.content.pm.ApplicationInfo; 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; import com.android.settings.testutils.FakeFeatureFactory; 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 0c0cd4c9630..43367fe9a15 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 bd11a159ba0..ebcf4c1634b 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 c9a9c0040ec..e007f60c222 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java @@ -27,8 +27,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.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 586c4486846..56552132515 100644 --- a/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java @@ -33,7 +33,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 com.android.settings.wrapper.OverlayManagerWrapper; 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; From 07e55d97caedd291f5fd91de701a45dc4e770b39 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Mon, 27 Aug 2018 14:28:54 -0700 Subject: [PATCH 10/13] DO NOT MERGE: Cherry-pick a bunch fixes to AOSP Task affinity updates - Remove task affinity for AppDrawOver Settings - Remove task affinity for ConfigNotificationSettings The task affinity is messing with the back stack for this activity when launched externally Fixes: 80281932 Fixes: 80290571 Test: manual Disable uninstall update option for secondary users. Fixes: 110249550 Test: manual Suppress some gesture search when there is no hardware Fixes: 110250839 Test: robotests Check wifi password length by byte, not char. Change-Id: Ic25ef766886507211c3de8764c1cffef2b27a025 Fixes: 79209073 Test: robotest --- AndroidManifest.xml | 2 -- .../appinfo/AppInfoDashboardFragment.java | 7 +++-- .../gestures/SwipeToNotificationSettings.java | 5 +++ src/com/android/settings/wifi/WifiUtils.java | 6 ++-- .../appinfo/AppInfoDashboardFragmentTest.java | 8 ++--- .../SwipeToNotificationSettingsTest.java | 31 ++++++++++++++----- .../android/settings/wifi/WifiUtilsTest.java | 2 +- 7 files changed, 42 insertions(+), 19 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6f80e111600..61b12a6fb9c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2620,7 +2620,6 @@ android:name="Settings$ConfigureNotificationSettingsActivity" android:label="@string/configure_notification_settings" android:exported="true" - android:taskAffinity="com.android.settings" android:parentActivityName="Settings"> @@ -2951,7 +2950,6 @@ diff --git a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java index e71c8d1e916..826254ed066 100755 --- a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java +++ b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java @@ -67,6 +67,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; + /** * Dashboard fragment to display application information from Settings. This activity presents * extended information associated with a package like code, data, total size, permissions @@ -350,8 +351,10 @@ public class AppInfoDashboardFragment extends DashboardFragment final MenuItem uninstallUpdatesItem = menu.findItem(UNINSTALL_UPDATES); final boolean uninstallUpdateDisabled = getContext().getResources().getBoolean( R.bool.config_disable_uninstall_update); - uninstallUpdatesItem.setVisible( - mUpdatedSysApp && !mAppsControlDisallowedBySystem && !uninstallUpdateDisabled); + uninstallUpdatesItem.setVisible(mUserManager.isAdminUser() + && mUpdatedSysApp + && !mAppsControlDisallowedBySystem + && !uninstallUpdateDisabled); if (uninstallUpdatesItem.isVisible()) { RestrictedLockUtils.setMenuItemAsDisabledByAdmin(getActivity(), uninstallUpdatesItem, mAppsControlDisallowedAdmin); diff --git a/src/com/android/settings/gestures/SwipeToNotificationSettings.java b/src/com/android/settings/gestures/SwipeToNotificationSettings.java index c18289c1a92..7eb3d6cbe5b 100644 --- a/src/com/android/settings/gestures/SwipeToNotificationSettings.java +++ b/src/com/android/settings/gestures/SwipeToNotificationSettings.java @@ -70,5 +70,10 @@ public class SwipeToNotificationSettings extends DashboardFragment { sir.xmlResId = R.xml.swipe_to_notification_settings; return Arrays.asList(sir); } + + @Override + protected boolean isPageSearchEnabled(Context context) { + return SwipeToNotificationPreferenceController.isAvailable(context); + } }; } diff --git a/src/com/android/settings/wifi/WifiUtils.java b/src/com/android/settings/wifi/WifiUtils.java index 99b77d9e36b..fd9d27e9c20 100644 --- a/src/com/android/settings/wifi/WifiUtils.java +++ b/src/com/android/settings/wifi/WifiUtils.java @@ -27,6 +27,7 @@ import android.provider.Settings; import android.text.TextUtils; import com.android.settingslib.wrapper.PackageManagerWrapper; +import java.nio.charset.StandardCharsets; public class WifiUtils { @@ -40,7 +41,7 @@ public class WifiUtils { if (TextUtils.isEmpty(ssid)) { return false; } - return ssid.length() > SSID_ASCII_MAX_LENGTH; + return ssid.getBytes(StandardCharsets.UTF_8).length > SSID_ASCII_MAX_LENGTH; } public static boolean isSSIDTooShort(String ssid) { @@ -61,8 +62,9 @@ public class WifiUtils { /** * This method is a stripped and negated version of WifiConfigStore.canModifyNetwork. + * * @param context Context of caller - * @param config The WiFi config. + * @param config The WiFi config. * @return true if Settings cannot modify the config due to lockDown. */ public static boolean isNetworkLockedDown(Context context, WifiConfiguration config) { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java index 3128f30f656..909d574ee48 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java @@ -91,7 +91,9 @@ public final class AppInfoDashboardFragmentTest { doReturn(mActivity).when(mFragment).getActivity(); doReturn(mShadowContext).when(mFragment).getContext(); doReturn(mPackageManager).when(mActivity).getPackageManager(); + when(mUserManager.isAdminUser()).thenReturn(true); + ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager); // Default to not considering any apps to be instant (individual tests can override this). ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider", (InstantAppDataProvider) (i -> false)); @@ -102,7 +104,7 @@ public final class AppInfoDashboardFragmentTest { when(mDevicePolicyManager.packageHasActiveAdmins(nullable(String.class))).thenReturn(false); when(mUserManager.getUsers().size()).thenReturn(2); ReflectionHelpers.setField(mFragment, "mDpm", mDevicePolicyManager); - ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager); + final ApplicationInfo info = new ApplicationInfo(); info.enabled = true; final AppEntry appEntry = mock(AppEntry.class); @@ -118,7 +120,6 @@ public final class AppInfoDashboardFragmentTest { when(mDevicePolicyManager.packageHasActiveAdmins(nullable(String.class))).thenReturn(false); when(mUserManager.getUsers().size()).thenReturn(2); ReflectionHelpers.setField(mFragment, "mDpm", mDevicePolicyManager); - ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager); final ApplicationInfo info = new ApplicationInfo(); info.flags = ApplicationInfo.FLAG_INSTALLED; info.enabled = true; @@ -217,7 +218,6 @@ public final class AppInfoDashboardFragmentTest { final PackageInfo packageInfo = mock(PackageInfo.class); ReflectionHelpers.setField(mFragment, "mDpm", mDevicePolicyManager); - ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager); ReflectionHelpers.setField(mFragment, "mPackageInfo", packageInfo); assertThat(mFragment.shouldShowUninstallForAll(appEntry)).isFalse(); @@ -258,7 +258,6 @@ public final class AppInfoDashboardFragmentTest { userInfos.add(new UserInfo(userID1, "User1", UserInfo.FLAG_PRIMARY)); userInfos.add(new UserInfo(userID2, "yue", UserInfo.FLAG_GUEST)); when(mUserManager.getUsers(true)).thenReturn(userInfos); - ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager); final ApplicationInfo appInfo = new ApplicationInfo(); appInfo.flags = ApplicationInfo.FLAG_INSTALLED; when(mPackageManager.getApplicationInfoAsUser( @@ -282,7 +281,6 @@ public final class AppInfoDashboardFragmentTest { userInfos.add(new UserInfo(userID1, "User1", UserInfo.FLAG_PRIMARY)); userInfos.add(new UserInfo(userID2, "yue", UserInfo.FLAG_GUEST)); when(mUserManager.getUsers(true)).thenReturn(userInfos); - ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager); final ApplicationInfo appInfo = new ApplicationInfo(); appInfo.flags = ApplicationInfo.FLAG_INSTALLED; when(mPackageManager.getApplicationInfoAsUser( diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java index 78e8603655c..de7b73c810f 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java @@ -23,28 +23,33 @@ import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settings.testutils.shadow.ShadowUtils; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) public class SwipeToNotificationSettingsTest { - @Mock private Context mContext; private SwipeToNotificationSettings mFragment; @Before public void setUp() { - MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; mFragment = new SwipeToNotificationSettings(); + ShadowUtils.reset(); + } + + @After + public void tearDown() { + ShadowUtils.reset(); } @Test @@ -56,10 +61,22 @@ public class SwipeToNotificationSettingsTest { @Test public void testSearchIndexProvider_shouldIndexResource() { final List indexRes = - SwipeToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER - .getXmlResourcesToIndex(RuntimeEnvironment.application, true /* enabled */); + SwipeToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER + .getXmlResourcesToIndex(mContext, true /* enabled */); assertThat(indexRes).isNotNull(); assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId()); } + + @Test + @Config(shadows = ShadowUtils.class) + public void getNonIndexableKeys_noFingerprintHardware_shouldSuppressPage() { + ShadowUtils.setFingerprintManager(null); + + final List niks = SwipeToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER + .getNonIndexableKeys(mContext); + + assertThat(niks).isNotEmpty(); + } + } diff --git a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java index 1f49654c402..806399d191f 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java @@ -29,7 +29,7 @@ public class WifiUtilsTest { @Test public void testSSID() { assertThat(WifiUtils.isSSIDTooLong("123")).isFalse(); - assertThat(WifiUtils.isSSIDTooLong("☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎")).isTrue(); + assertThat(WifiUtils.isSSIDTooLong("☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎")).isTrue(); assertThat(WifiUtils.isSSIDTooShort("123")).isFalse(); assertThat(WifiUtils.isSSIDTooShort("")).isTrue(); From bc7b20b419975ab764b9132433a6a4df3020dfd7 Mon Sep 17 00:00:00 2001 From: hjchangliao Date: Fri, 27 Apr 2018 11:27:46 +0800 Subject: [PATCH 11/13] DO NOT MERGE: Cherry-pick misc fixes to AOSP Remove wrapper for LocationManager Remove LocationManagerWrapper from SettingsLib Bug: 76167422 Test: RunSettingsRoboTests Remove OverlayManagerWrapper class out from Settings Remove OverlayManagerWrapper and use IOverlayManager instead. Based on comment from reviewer to refactor ThemePreferenceController. Bug: 76167422 Test: RunSettingsRoboTests Change-Id: I13a7997b5e21a16ffb723971d267132fbf65e4a6 --- ...lateDisplayCutoutPreferenceController.java | 46 +++++--- .../display/ThemePreferenceController.java | 71 ++++++------ .../wrapper/OverlayManagerWrapper.java | 102 ------------------ ...DisplayCutoutPreferenceControllerTest.java | 28 +++-- .../ThemePreferenceControllerTest.java | 68 ++++++++++-- .../location/LocationEnablerTest.java | 7 +- .../ThemePreferenceControllerTest.java | 41 ++----- 7 files changed, 166 insertions(+), 197 deletions(-) delete mode 100644 src/com/android/settings/wrapper/OverlayManagerWrapper.java diff --git a/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java index 9fa323a33b1..973868b8d1e 100644 --- a/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java +++ b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java @@ -19,18 +19,21 @@ package com.android.settings.development; import static android.os.UserHandle.USER_SYSTEM; import android.content.Context; +import android.content.om.IOverlayManager; +import android.content.om.OverlayInfo; import android.content.pm.PackageManager; +import android.os.RemoteException; +import android.os.ServiceManager; +import android.text.TextUtils; +import android.view.DisplayCutout; + import android.support.annotation.VisibleForTesting; import android.support.v7.preference.ListPreference; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import android.text.TextUtils; -import android.view.DisplayCutout; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; -import com.android.settings.wrapper.OverlayManagerWrapper; -import com.android.settings.wrapper.OverlayManagerWrapper.OverlayInfo; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import java.util.List; @@ -41,7 +44,7 @@ public class EmulateDisplayCutoutPreferenceController extends private static final String KEY = "display_cutout_emulation"; - private final OverlayManagerWrapper mOverlayManager; + private final IOverlayManager mOverlayManager; private final boolean mAvailable; private ListPreference mPreference; @@ -49,7 +52,7 @@ public class EmulateDisplayCutoutPreferenceController extends @VisibleForTesting EmulateDisplayCutoutPreferenceController(Context context, PackageManager packageManager, - OverlayManagerWrapper overlayManager) { + IOverlayManager overlayManager) { super(context); mOverlayManager = overlayManager; mPackageManager = packageManager; @@ -57,7 +60,8 @@ public class EmulateDisplayCutoutPreferenceController extends } public EmulateDisplayCutoutPreferenceController(Context context) { - this(context, context.getPackageManager(), new OverlayManagerWrapper()); + this(context, context.getPackageManager(), IOverlayManager.Stub + .asInterface(ServiceManager.getService(Context.OVERLAY_SERVICE))); } @Override @@ -102,10 +106,14 @@ public class EmulateDisplayCutoutPreferenceController extends } final boolean result; - if (TextUtils.isEmpty(packageName)) { - result = mOverlayManager.setEnabled(currentPackageName, false, USER_SYSTEM); - } else { - result = mOverlayManager.setEnabledExclusiveInCategory(packageName, USER_SYSTEM); + try { + if (TextUtils.isEmpty(packageName)) { + result = mOverlayManager.setEnabled(currentPackageName, false, USER_SYSTEM); + } else { + result = mOverlayManager.setEnabledExclusiveInCategory(packageName, USER_SYSTEM); + } + } catch (RemoteException re) { + throw re.rethrowFromSystemServer(); } updateState(mPreference); return result; @@ -145,13 +153,17 @@ public class EmulateDisplayCutoutPreferenceController extends } private OverlayInfo[] getOverlayInfos() { - @SuppressWarnings("unchecked") List overlayInfos = - mOverlayManager.getOverlayInfosForTarget("android", USER_SYSTEM); - for (int i = overlayInfos.size() - 1; i >= 0; i--) { - if (!DisplayCutout.EMULATION_OVERLAY_CATEGORY.equals( - overlayInfos.get(i).category)) { - overlayInfos.remove(i); + List overlayInfos; + try { + overlayInfos = mOverlayManager.getOverlayInfosForTarget("android", USER_SYSTEM); + for (int i = overlayInfos.size() - 1; i >= 0; i--) { + if (!DisplayCutout.EMULATION_OVERLAY_CATEGORY.equals( + overlayInfos.get(i).category)) { + overlayInfos.remove(i); + } } + } catch (RemoteException re) { + throw re.rethrowFromSystemServer(); } return overlayInfos.toArray(new OverlayInfo[overlayInfos.size()]); } diff --git a/src/com/android/settings/display/ThemePreferenceController.java b/src/com/android/settings/display/ThemePreferenceController.java index 1bc49b625d3..c05683444c2 100644 --- a/src/com/android/settings/display/ThemePreferenceController.java +++ b/src/com/android/settings/display/ThemePreferenceController.java @@ -13,7 +13,11 @@ */ package com.android.settings.display; +import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_THEME; + import android.content.Context; +import android.content.om.IOverlayManager; +import android.content.om.OverlayInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; @@ -23,13 +27,12 @@ import android.os.UserHandle; import android.support.annotation.VisibleForTesting; import android.support.v7.preference.ListPreference; import android.support.v7.preference.Preference; + import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; -import com.android.settings.wrapper.OverlayManagerWrapper; -import com.android.settings.wrapper.OverlayManagerWrapper.OverlayInfo; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -37,24 +40,22 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_THEME; - public class ThemePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { private static final String KEY_THEME = "theme"; private final MetricsFeatureProvider mMetricsFeatureProvider; - private final OverlayManagerWrapper mOverlayService; + private final IOverlayManager mOverlayService; private final PackageManager mPackageManager; public ThemePreferenceController(Context context) { - this(context, ServiceManager.getService(Context.OVERLAY_SERVICE) != null - ? new OverlayManagerWrapper() : null); + this(context, IOverlayManager.Stub + .asInterface(ServiceManager.getService(Context.OVERLAY_SERVICE))); } @VisibleForTesting - ThemePreferenceController(Context context, OverlayManagerWrapper overlayManager) { + ThemePreferenceController(Context context, IOverlayManager overlayManager) { super(context); mOverlayService = overlayManager; mPackageManager = context.getPackageManager(); @@ -77,7 +78,7 @@ public class ThemePreferenceController extends AbstractPreferenceController impl @Override public void updateState(Preference preference) { ListPreference pref = (ListPreference) preference; - String[] pkgs = getAvailableThemes(); + String[] pkgs = getAvailableThemes(false /* currentThemeOnly */); CharSequence[] labels = new CharSequence[pkgs.length]; for (int i = 0; i < pkgs.length; i++) { try { @@ -109,11 +110,15 @@ public class ThemePreferenceController extends AbstractPreferenceController impl @Override public boolean onPreferenceChange(Preference preference, Object newValue) { - String current = getTheme(); + String current = getCurrentTheme(); if (Objects.equals(newValue, current)) { return true; } - mOverlayService.setEnabledExclusiveInCategory((String) newValue, UserHandle.myUserId()); + try { + mOverlayService.setEnabledExclusiveInCategory((String) newValue, UserHandle.myUserId()); + } catch (RemoteException re) { + throw re.rethrowFromSystemServer(); + } return true; } @@ -129,39 +134,43 @@ public class ThemePreferenceController extends AbstractPreferenceController impl } } - private String getTheme() { - List infos = mOverlayService.getOverlayInfosForTarget("android", - UserHandle.myUserId()); - for (int i = 0, size = infos.size(); i < size; i++) { - if (infos.get(i).isEnabled() && isTheme(infos.get(i))) { - return infos.get(i).packageName; - } - } - return null; - } - @Override public boolean isAvailable() { if (mOverlayService == null) return false; - String[] themes = getAvailableThemes(); + String[] themes = getAvailableThemes(false /* currentThemeOnly */); return themes != null && themes.length > 1; } @VisibleForTesting String getCurrentTheme() { - return getTheme(); + String[] themePackages = getAvailableThemes(true /* currentThemeOnly */); + return themePackages.length < 1 ? null : themePackages[0]; } @VisibleForTesting - String[] getAvailableThemes() { - List infos = mOverlayService.getOverlayInfosForTarget("android", - UserHandle.myUserId()); - List pkgs = new ArrayList<>(infos.size()); - for (int i = 0, size = infos.size(); i < size; i++) { - if (isTheme(infos.get(i))) { - pkgs.add(infos.get(i).packageName); + String[] getAvailableThemes(boolean currentThemeOnly) { + List infos; + List pkgs; + try { + infos = mOverlayService.getOverlayInfosForTarget("android", UserHandle.myUserId()); + pkgs = new ArrayList<>(infos.size()); + for (int i = 0, size = infos.size(); i < size; i++) { + if (isTheme(infos.get(i))) { + if (infos.get(i).isEnabled() && currentThemeOnly) { + return new String[] {infos.get(i).packageName}; + } else { + pkgs.add(infos.get(i).packageName); + } + } } + } catch (RemoteException re) { + throw re.rethrowFromSystemServer(); + } + + // Current enabled theme is not found. + if (currentThemeOnly) { + return new String[0]; } return pkgs.toArray(new String[pkgs.size()]); } diff --git a/src/com/android/settings/wrapper/OverlayManagerWrapper.java b/src/com/android/settings/wrapper/OverlayManagerWrapper.java deleted file mode 100644 index 6e3c2348857..00000000000 --- a/src/com/android/settings/wrapper/OverlayManagerWrapper.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.wrapper; - -import android.content.Context; -import android.content.om.IOverlayManager; -import android.content.om.OverlayInfo; -import android.os.RemoteException; -import android.os.ServiceManager; - -import java.util.ArrayList; -import java.util.List; - -public class OverlayManagerWrapper { - - private final IOverlayManager mOverlayManager; - - public OverlayManagerWrapper(IOverlayManager overlayManager) { - mOverlayManager = overlayManager; - } - - public OverlayManagerWrapper() { - this(IOverlayManager.Stub.asInterface(ServiceManager.getService(Context.OVERLAY_SERVICE))); - } - - public List getOverlayInfosForTarget(String overlay, int userId) { - if (mOverlayManager == null) { - return new ArrayList<>(); - } - try { - List infos - = mOverlayManager.getOverlayInfosForTarget(overlay, userId); - ArrayList result = new ArrayList<>(infos.size()); - for (int i = 0; i < infos.size(); i++) { - result.add(new OverlayInfo(infos.get(i))); - } - return result; - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } - - public boolean setEnabled(String overlay, boolean enabled, int userId) { - if (mOverlayManager == null) { - return false; - } - try { - return mOverlayManager.setEnabled(overlay, enabled, userId); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } - - public boolean setEnabledExclusiveInCategory(String overlay, int userId) { - if (mOverlayManager == null) { - return false; - } - try { - return mOverlayManager.setEnabledExclusiveInCategory(overlay, userId); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } - - public static class OverlayInfo { - - public static final String CATEGORY_THEME = android.content.om.OverlayInfo.CATEGORY_THEME; - public final String packageName; - public final String category; - private final boolean mEnabled; - - public OverlayInfo(String packageName, String category, boolean enabled) { - this.packageName = packageName; - this.category = category; - mEnabled = enabled; - } - - public OverlayInfo(android.content.om.OverlayInfo info) { - mEnabled = info.isEnabled(); - category = info.category; - packageName = info.packageName; - } - - public boolean isEnabled() { - return mEnabled; - } - } -} diff --git a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java index 73c976c70bb..a742988d98c 100644 --- a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java @@ -26,14 +26,15 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; 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 android.os.RemoteException; import android.view.DisplayCutout; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.wrapper.OverlayManagerWrapper; -import com.android.settings.wrapper.OverlayManagerWrapper.OverlayInfo; import org.junit.Before; import org.junit.Test; @@ -41,6 +42,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import java.util.ArrayList; import java.util.Arrays; @RunWith(SettingsRobolectricTestRunner.class) @@ -54,7 +56,7 @@ public class EmulateDisplayCutoutPreferenceControllerTest { @Mock private Context mContext; @Mock - private OverlayManagerWrapper mOverlayManager; + private IOverlayManager mOverlayManager; @Mock private PackageManager mPackageManager; @Mock @@ -64,6 +66,7 @@ public class EmulateDisplayCutoutPreferenceControllerTest { @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); + when(mContext.getSystemService(Context.OVERLAY_SERVICE)).thenReturn(mOverlayManager); mockCurrentOverlays(); when(mPackageManager.getApplicationInfo(any(), anyInt())) .thenThrow(PackageManager.NameNotFoundException.class); @@ -72,8 +75,12 @@ public class EmulateDisplayCutoutPreferenceControllerTest { } Object mockCurrentOverlays(OverlayInfo... overlays) { - return when(mOverlayManager.getOverlayInfosForTarget(eq("android"), anyInt())) - .thenReturn(Arrays.asList(overlays)); + try { + return when(mOverlayManager.getOverlayInfosForTarget(eq("android"), anyInt())) + .thenReturn(Arrays.asList(overlays)); + } catch (RemoteException re) { + return new ArrayList(); + } } @Test @@ -146,6 +153,15 @@ public class EmulateDisplayCutoutPreferenceControllerTest { } private static OverlayInfo createFakeOverlay(String pkg, boolean enabled) { - return new OverlayInfo(pkg, DisplayCutout.EMULATION_OVERLAY_CATEGORY, enabled); + final int state = (enabled) ? OverlayInfo.STATE_ENABLED : OverlayInfo.STATE_DISABLED; + + return new OverlayInfo(pkg /* packageName */, + pkg + ".target" /* targetPackageName */, + DisplayCutout.EMULATION_OVERLAY_CATEGORY /* category */, + pkg + ".baseCodePath" /* baseCodePath */, + state /* state */, + 0 /* userId */, + 0 /* priority */, + true /* isStatic */); } } \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java index 6a059b35980..56e9c2d04ea 100644 --- a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java @@ -16,26 +16,28 @@ package com.android.settings.display; +import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; +import android.content.om.IOverlayManager; +import android.content.om.OverlayInfo; 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 com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.wrapper.OverlayManagerWrapper; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -44,6 +46,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import java.util.Arrays; + @RunWith(SettingsRobolectricTestRunner.class) public class ThemePreferenceControllerTest { @@ -55,6 +59,8 @@ public class ThemePreferenceControllerTest { private ApplicationInfo mApplicationInfo; @Mock private ListPreference mPreference; + @Mock + private IOverlayManager mOverlayManager; private ThemePreferenceController mController; @@ -67,8 +73,28 @@ public class ThemePreferenceControllerTest { when(mContext.getString(R.string.default_theme)) .thenReturn(RuntimeEnvironment.application.getString(R.string.default_theme)); - mController = - spy(new ThemePreferenceController(mContext, mock(OverlayManagerWrapper.class))); + when(mContext.getSystemService(Context.OVERLAY_SERVICE)).thenReturn(mOverlayManager); + mController = spy(new ThemePreferenceController(mContext, mOverlayManager)); + } + + @Test + public void testAvailable_false() throws Exception { + when(mPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn( + new PackageInfo()); + when(mOverlayManager.getOverlayInfosForTarget(any(), anyInt())) + .thenReturn(Arrays.asList(new OverlayInfo("", "", "", "", 0, 0, 0, false))); + assertThat(mController.isAvailable()).isFalse(); + } + + @Test + public void testAvailable_true() throws Exception { + when(mPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn( + new PackageInfo()); + when(mOverlayManager.getOverlayInfosForTarget(any(), anyInt())) + .thenReturn(Arrays.asList( + new OverlayInfo("", "", OverlayInfo.CATEGORY_THEME, "", 0, 0, 0, true), + new OverlayInfo("", "", OverlayInfo.CATEGORY_THEME, "", 0, 0, 0, true))); + assertThat(mController.isAvailable()).isTrue(); } @Test @@ -79,7 +105,7 @@ public class ThemePreferenceControllerTest { final String themeLabel2 = "Theme2"; final String[] themes = {pkg1, pkg2}; doReturn("pkg1.theme1").when(mController).getCurrentTheme(); - doReturn(themes).when(mController).getAvailableThemes(); + doReturn(themes).when(mController).getAvailableThemes(false /* currentThemeOnly */); when(mPackageManager.getApplicationInfo(anyString(), anyInt()).loadLabel(mPackageManager)) .thenReturn(themeLabel1) .thenReturn(themeLabel2); @@ -98,7 +124,7 @@ public class ThemePreferenceControllerTest { final String themeLabel2 = "Theme2"; final String[] themes = {pkg1, pkg2}; doReturn(null).when(mController).getCurrentTheme(); - doReturn(themes).when(mController).getAvailableThemes(); + doReturn(themes).when(mController).getAvailableThemes(false /* currentThemeOnly */); when(mPackageManager.getApplicationInfo(anyString(), anyInt()).loadLabel(mPackageManager)) .thenReturn(themeLabel1) .thenReturn(themeLabel2); @@ -109,4 +135,32 @@ public class ThemePreferenceControllerTest { .setSummary(RuntimeEnvironment.application.getString(R.string.default_theme)); verify(mPreference).setValue(null); } + + @Test + public void getCurrentTheme_withEnabledState() throws Exception { + OverlayInfo info1 = new OverlayInfo("com.android.Theme1", "android", + OverlayInfo.CATEGORY_THEME, "", OverlayInfo.STATE_ENABLED, 0, 0, true); + OverlayInfo info2 = new OverlayInfo("com.android.Theme2", "android", + OverlayInfo.CATEGORY_THEME, "", 0, 0, 0, true); + when(mOverlayManager.getOverlayInfosForTarget(any(), anyInt())).thenReturn( + Arrays.asList(info1, info2)); + when(mPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn( + new PackageInfo()); + + assertThat(mController.getCurrentTheme()).isEqualTo(info1.packageName); + } + + @Test + public void testGetCurrentTheme_withoutEnabledState() throws Exception { + OverlayInfo info1 = new OverlayInfo("com.android.Theme1", "android", + OverlayInfo.CATEGORY_THEME, "", OverlayInfo.STATE_DISABLED, 0, 0, true); + OverlayInfo info2 = new OverlayInfo("com.android.Theme2", "android", + OverlayInfo.CATEGORY_THEME, "", 0, 0, 0, true); + when(mOverlayManager.getOverlayInfosForTarget(any(), anyInt())).thenReturn( + Arrays.asList(info1, info2)); + when(mPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn( + new PackageInfo()); + + assertThat(mController.getCurrentTheme()).isNull(); + } } diff --git a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java index 0c0cd4c9630..f4973c06303 100644 --- a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java @@ -43,7 +43,6 @@ import android.text.TextUtils; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.wrapper.LocationManagerWrapper; import org.junit.Before; import org.junit.Test; @@ -62,7 +61,7 @@ import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { ShadowSecureSettings.class, - LocationEnablerTest.ShadowLocationManagerWrapper.class}) + LocationEnablerTest.ShadowLocationManager.class}) public class LocationEnablerTest { @Mock @@ -272,8 +271,8 @@ public class LocationEnablerTest { return intent -> TextUtils.equals(expected, intent.getAction()); } - @Implements(value = LocationManagerWrapper.class) - public static class ShadowLocationManagerWrapper { + @Implements(value = LocationManager.class) + public static class ShadowLocationManager { @Implementation public void setLocationEnabledForUser(boolean enabled, UserHandle userHandle) { diff --git a/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java index 586c4486846..d4f00497cf0 100644 --- a/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -26,6 +27,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.ContextWrapper; +import android.content.om.IOverlayManager; import android.content.om.OverlayInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; @@ -35,8 +37,6 @@ import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; import android.support.v7.preference.ListPreference; -import com.android.settings.wrapper.OverlayManagerWrapper; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -48,14 +48,14 @@ import java.util.ArrayList; @RunWith(AndroidJUnit4.class) public class ThemePreferenceControllerTest { - private OverlayManagerWrapper mMockOverlayManager; + private IOverlayManager mMockOverlayManager; private ContextWrapper mContext; private ThemePreferenceController mPreferenceController; private PackageManager mMockPackageManager; @Before public void setup() { - mMockOverlayManager = mock(OverlayManagerWrapper.class); + mMockOverlayManager = mock(IOverlayManager.class); mMockPackageManager = mock(PackageManager.class); mContext = new ContextWrapper(InstrumentationRegistry.getTargetContext()) { @Override @@ -69,9 +69,9 @@ public class ThemePreferenceControllerTest { @Test public void testUpdateState() throws Exception { OverlayInfo info1 = new OverlayInfo("com.android.Theme1", "android", - "", "", OverlayInfo.STATE_ENABLED, 0, 0, true); + OverlayInfo.CATEGORY_THEME, "", OverlayInfo.STATE_ENABLED, 0, 0, true); OverlayInfo info2 = new OverlayInfo("com.android.Theme2", "android", - "", "", 0, 0, 0, true); + OverlayInfo.CATEGORY_THEME, "", 0, 0, 0, true); when(mMockPackageManager.getApplicationInfo(any(), anyInt())).thenAnswer(inv -> { ApplicationInfo info = mock(ApplicationInfo.class); if ("com.android.Theme1".equals(inv.getArguments()[0])) { @@ -105,9 +105,9 @@ public class ThemePreferenceControllerTest { @Test public void testUpdateState_withStaticOverlay() throws Exception { OverlayInfo info1 = new OverlayInfo("com.android.Theme1", "android", - "", "", OverlayInfo.STATE_ENABLED, 0, 0, true); + OverlayInfo.CATEGORY_THEME, "", OverlayInfo.STATE_ENABLED, 0, 0, true); OverlayInfo info2 = new OverlayInfo("com.android.Theme2", "android", - "", "", OverlayInfo.STATE_ENABLED, 0, 0, true); + OverlayInfo.CATEGORY_THEME, "", OverlayInfo.STATE_ENABLED, 0, 0, true); when(mMockPackageManager.getApplicationInfo(any(), anyInt())).thenAnswer(inv -> { ApplicationInfo info = mock(ApplicationInfo.class); if ("com.android.Theme1".equals(inv.getArguments()[0])) { @@ -140,29 +140,10 @@ public class ThemePreferenceControllerTest { verify(pref).setValue(eq("com.android.Theme2")); } - @Test - public void testAvailable_false() throws Exception { - when(mMockPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn( - new PackageInfo()); - when(mMockOverlayManager.getOverlayInfosForTarget(any(), anyInt())) - .thenReturn(list(new OverlayInfo("", "", "", "", 0, 0, 0, false))); - assertThat(mPreferenceController.isAvailable()).isFalse(); - } - - @Test - public void testAvailable_true() throws Exception { - when(mMockPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn( - new PackageInfo()); - when(mMockOverlayManager.getOverlayInfosForTarget(any(), anyInt())) - .thenReturn(list(new OverlayInfo("", "", "", "", 0, 0, 0, true), - new OverlayInfo("", "", "", "", 0, 0, 0, true))); - assertThat(mPreferenceController.isAvailable()).isTrue(); - } - - private ArrayList list(OverlayInfo... infos) { - ArrayList list = new ArrayList<>(); + private ArrayList list(OverlayInfo... infos) { + ArrayList list = new ArrayList<>(); for (OverlayInfo info : infos) { - list.add(new OverlayManagerWrapper.OverlayInfo(info)); + list.add(info); } return list; } From 44a12fc5ee74b06aea577afb4fd8a809408cf62b Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Tue, 28 Aug 2018 13:43:08 -0700 Subject: [PATCH 12/13] Turn down app indexing for slices. Bug: 112587202 Test: robotests Change-Id: Ice84173bd9617f58689438c460522104776c46ce --- .../android/settings/search/DeviceIndexFeatureProvider.java | 4 +++- .../settings/search/DeviceIndexFeatureProviderImpl.java | 5 ----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/search/DeviceIndexFeatureProvider.java b/src/com/android/settings/search/DeviceIndexFeatureProvider.java index e6b3e937b85..a55fcff8095 100644 --- a/src/com/android/settings/search/DeviceIndexFeatureProvider.java +++ b/src/com/android/settings/search/DeviceIndexFeatureProvider.java @@ -50,7 +50,9 @@ public interface DeviceIndexFeatureProvider { // When the device language changes, re-index so Slices trigger in device language. Locale LANGUAGE = Locale.getDefault(); - boolean isIndexingEnabled(); + default boolean isIndexingEnabled() { + return false; + } void index(Context context, CharSequence title, Uri sliceUri, Uri launchUri, List keywords); diff --git a/src/com/android/settings/search/DeviceIndexFeatureProviderImpl.java b/src/com/android/settings/search/DeviceIndexFeatureProviderImpl.java index 087ecf83dbc..8fd1606452f 100644 --- a/src/com/android/settings/search/DeviceIndexFeatureProviderImpl.java +++ b/src/com/android/settings/search/DeviceIndexFeatureProviderImpl.java @@ -21,11 +21,6 @@ import java.util.List; public class DeviceIndexFeatureProviderImpl implements DeviceIndexFeatureProvider { - @Override - public boolean isIndexingEnabled() { - return false; - } - @Override public void index(Context context, CharSequence title, Uri sliceUri, Uri launchUri, List keywords) { From 23f8d59d0208c87a759c5a3a7faa8afe4a4e213c Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Tue, 28 Aug 2018 15:11:40 -0700 Subject: [PATCH 13/13] Sort imports Having consistent import order will reduce chance of merge conflict between internal and external master Test: rebuild Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b --- .../settings/AllowBindAppWidgetActivity.java | 4 +-- src/com/android/settings/BandMode.java | 4 +-- .../android/settings/BugreportPreference.java | 4 +-- .../android/settings/CredentialStorage.java | 5 ++-- .../settings/CustomListPreference.java | 6 ++--- .../settings/EncryptionInterstitial.java | 4 +-- src/com/android/settings/IccLockSettings.java | 6 ++--- src/com/android/settings/MasterClear.java | 4 +-- .../settings/MonitoringCertInfoActivity.java | 4 +-- .../PreviewSeekBarPreferenceFragment.java | 6 ++--- src/com/android/settings/ProxySelector.java | 4 +-- src/com/android/settings/RadioInfo.java | 4 +-- .../RegulatoryInfoDisplayActivity.java | 4 +-- .../android/settings/ResetNetworkConfirm.java | 6 ++--- .../settings/RestrictedListPreference.java | 10 ++++---- .../settings/RestrictedSettingsFragment.java | 6 ++--- .../android/settings/SettingsDumpService.java | 4 +-- .../android/settings/SettingsInitialize.java | 4 +-- .../settings/SettingsLicenseActivity.java | 10 ++++---- .../settings/SettingsPreferenceFragment.java | 20 +++++++-------- .../android/settings/SetupWizardUtils.java | 4 +-- src/com/android/settings/TestingSettings.java | 4 +-- src/com/android/settings/TetherSettings.java | 8 +++--- .../TrustedCredentialsDialogBuilder.java | 4 +-- .../settings/UserCredentialsSettings.java | 10 ++++---- src/com/android/settings/Utils.java | 10 ++++---- .../AccessibilityServiceWarning.java | 4 +-- .../accessibility/AccessibilitySettings.java | 16 ++++++------ .../AccessibilitySettingsForSetupWizard.java | 4 +-- ...ibilitySettingsForSetupWizardActivity.java | 6 ++--- ...cessibilityShortcutPreferenceFragment.java | 6 ++--- .../CaptionPropertiesFragment.java | 10 ++++---- .../ColorInversionPreferenceController.java | 4 +-- .../accessibility/ColorPreference.java | 4 +-- .../accessibility/ListDialogPreference.java | 4 +-- .../accessibility/LocalePreference.java | 4 +-- ...ificationGesturesPreferenceController.java | 4 +-- ...gnificationNavbarPreferenceController.java | 4 +-- .../ShortcutServicePickerFragment.java | 7 +++--- ...ccessibilityServicePreferenceFragment.java | 4 +-- .../ToggleAutoclickPreferenceFragment.java | 4 +-- .../ToggleDaltonizerPreferenceFragment.java | 6 ++--- .../ToggleFeaturePreferenceFragment.java | 6 ++--- ...ScreenMagnificationPreferenceFragment.java | 8 +++--- ...ibrationIntensityPreferenceController.java | 6 ++--- .../VibrationPreferenceFragment.java | 4 +-- .../AccountHeaderPreferenceController.java | 6 ++--- .../settings/accounts/AccountPreference.java | 6 ++--- .../accounts/AccountPreferenceController.java | 12 ++++----- .../AccountSyncPreferenceController.java | 8 +++--- .../accounts/AccountSyncSettings.java | 6 ++--- .../accounts/AccountTypePreference.java | 6 ++--- .../accounts/AccountTypePreferenceLoader.java | 12 ++++----- .../ChooseAccountPreferenceController.java | 8 +++--- .../ContactSearchPreferenceController.java | 4 +-- .../EmergencyInfoPreferenceController.java | 4 +-- ...erpriseDisclosurePreferenceController.java | 6 ++--- .../RemoveAccountPreferenceController.java | 8 +++--- .../accounts/SyncStateSwitchPreference.java | 6 ++--- .../WorkModePreferenceController.java | 10 ++++---- .../settings/applications/AppInfoBase.java | 8 +++--- .../applications/AppInfoWithHeader.java | 4 +-- .../applications/AppLaunchSettings.java | 10 ++++---- .../applications/AppStateAppOpsBridge.java | 4 +-- .../applications/AppStorageSettings.java | 14 +++++------ .../AppStorageSizesController.java | 6 ++--- .../applications/ClearDefaultsPreference.java | 8 +++--- .../applications/DirectoryAccessDetails.java | 13 +++++----- .../applications/LayoutPreference.java | 6 ++--- .../applications/ProcessStatsDetail.java | 8 +++--- .../applications/ProcessStatsSummary.java | 6 ++--- .../settings/applications/ProcessStatsUi.java | 6 ++--- .../RecentAppsPreferenceController.java | 12 ++++----- .../applications/RunningServiceDetails.java | 6 ++--- .../applications/SpacePreference.java | 4 +-- .../applications/UsageAccessDetails.java | 10 ++++---- .../AppBatteryPreferenceController.java | 13 +++++----- .../AppButtonsPreferenceController.java | 8 +++--- .../AppDataUsagePreferenceController.java | 12 ++++----- .../AppHeaderViewPreferenceController.java | 4 +-- .../appinfo/AppInfoDashboardFragment.java | 4 +-- .../AppInfoPreferenceControllerBase.java | 6 ++--- .../AppInstallerInfoPreferenceController.java | 4 +-- .../AppMemoryPreferenceController.java | 6 ++--- .../AppNotificationPreferenceController.java | 4 +-- .../AppOpenByDefaultPreferenceController.java | 6 ++--- .../AppPermissionPreferenceController.java | 6 ++--- .../AppSettingPreferenceController.java | 4 +-- .../AppStoragePreferenceController.java | 10 ++++---- .../appinfo/ButtonActionDialogFragment.java | 8 +++--- ...ltAppShortcutPreferenceControllerBase.java | 4 +-- .../appinfo/DrawOverlayDetails.java | 14 +++++------ ...ernalSourceDetailPreferenceController.java | 6 ++--- .../appinfo/ExternalSourcesDetails.java | 8 +++--- .../InstantAppButtonDialogFragment.java | 4 +-- ...InstantAppButtonsPreferenceController.java | 6 ++--- ...InstantAppDomainsPreferenceController.java | 4 +-- .../TimeSpentInAppPreferenceController.java | 8 +++--- .../appinfo/WriteSettingsDetails.java | 12 ++++----- .../applications/appops/AppOpsCategory.java | 10 ++++---- .../appops/BackgroundCheckSummary.java | 4 +-- .../AssistContextPreferenceController.java | 8 +++--- ...AssistFlashScreenPreferenceController.java | 10 ++++---- .../AssistScreenshotPreferenceController.java | 8 +++--- .../assist/AssistSettingObserver.java | 4 +-- .../assist/DefaultAssistPicker.java | 4 +-- .../DefaultAssistPreferenceController.java | 4 +-- ...DefaultVoiceInputPreferenceController.java | 6 ++--- .../defaultapps/AutofillPicker.java | 4 --- .../defaultapps/DefaultAppPickerFragment.java | 10 ++++---- .../DefaultAppPreferenceController.java | 4 +-- .../defaultapps/DefaultAutofillPicker.java | 4 ++- .../DefaultBrowserPreferenceController.java | 4 +-- ...ltPaymentSettingsPreferenceController.java | 4 +-- .../defaultapps/DefaultSmsPicker.java | 2 -- ...faultWorkAutofillPreferenceController.java | 1 + .../manageapplications/AppFilterItem.java | 4 +-- .../manageapplications/AppFilterRegistry.java | 4 +-- .../ApplicationViewHolder.java | 8 +++--- .../ManageApplications.java | 11 ++++---- .../MusicViewHolderController.java | 6 ++--- .../PhotosViewHolderController.java | 6 ++--- .../ResetAppPrefPreferenceController.java | 4 +-- .../manageapplications/ResetAppsHelper.java | 4 +-- .../managedomainurls/DomainAppPreference.java | 4 +-- .../DomainAppPreferenceController.java | 8 +++--- ...InstantAppAccountPreferenceController.java | 4 +-- .../deviceadmin/DeviceAdminAdd.java | 4 +-- .../DeviceAdminListPreferenceController.java | 12 ++++----- ...reInPictureDetailPreferenceController.java | 6 ++--- .../PictureInPictureDetails.java | 10 ++++---- .../PictureInPictureSettings.java | 10 ++++---- .../premiumsms/PremiumSmsAccess.java | 14 +++++------ .../vrlistener/VrListenerSettings.java | 4 +-- .../AutoRestorePreferenceController.java | 4 +-- .../BackupDataPreferenceController.java | 4 +-- .../backup/BackupSettingsActivity.java | 8 +++--- .../settings/backup/BackupSettingsHelper.java | 4 +-- .../BackupSettingsPreferenceController.java | 6 ++--- .../ConfigureAccountPreferenceController.java | 4 +-- .../DataManagementPreferenceController.java | 4 +-- .../backup/ToggleBackupSettingFragment.java | 10 ++++---- .../biometrics/BiometricEnrollBase.java | 2 -- .../biometrics/BiometricErrorDialog.java | 4 +-- .../BiometricStatusPreferenceController.java | 4 +-- ...aceSettingsFooterPreferenceController.java | 4 +-- ...ceSettingsImprovePreferenceController.java | 4 +-- ...tingsRemoveButtonPreferenceController.java | 4 +-- ...aceSettingsUnlockPreferenceController.java | 4 +-- .../FingerprintEnrollEnrolling.java | 4 +-- .../FingerprintEnrollFindSensor.java | 4 +-- ...FingerprintLocationAnimationVideoView.java | 4 +-- .../fingerprint/FingerprintSettings.java | 16 ++++++------ .../SetupFingerprintEnrollFindSensor.java | 8 +++--- .../AvailableMediaBluetoothDeviceUpdater.java | 4 +-- .../BluetoothDetailsButtonsController.java | 6 ++--- .../bluetooth/BluetoothDetailsController.java | 6 ++--- .../BluetoothDetailsHeaderController.java | 8 +++--- .../BluetoothDetailsMacAddressController.java | 6 ++--- .../BluetoothDetailsProfilesController.java | 14 +++++------ .../BluetoothDeviceDetailsFragment.java | 4 +-- ...uetoothDeviceNamePreferenceController.java | 8 +++--- .../bluetooth/BluetoothDevicePreference.java | 8 +++--- ...toothDeviceRenamePreferenceController.java | 9 +++---- .../bluetooth/BluetoothDeviceUpdater.java | 6 ++--- .../BluetoothDiscoverableEnabler.java | 4 +-- .../settings/bluetooth/BluetoothEnabler.java | 4 +-- .../BluetoothFilesPreferenceController.java | 6 ++--- .../BluetoothNameDialogFragment.java | 4 +-- .../bluetooth/BluetoothPairingController.java | 4 +-- .../bluetooth/BluetoothPairingDetail.java | 4 +-- .../BluetoothPairingDialogFragment.java | 6 ++--- .../BluetoothPairingPreferenceController.java | 4 +-- .../BluetoothPermissionActivity.java | 4 +-- .../bluetooth/BluetoothSliceBuilder.java | 12 ++++----- .../bluetooth/BluetoothSummaryUpdater.java | 4 +-- .../BluetoothSwitchPreferenceController.java | 4 +-- .../ConnectedBluetoothDeviceUpdater.java | 4 +-- .../DeviceListPreferenceFragment.java | 10 ++++---- .../bluetooth/DevicePickerActivity.java | 4 +-- .../bluetooth/DevicePickerFragment.java | 4 +-- .../bluetooth/ForgetDeviceDialogFragment.java | 6 ++--- .../RemoteDeviceNameDialogFragment.java | 4 +-- .../SavedBluetoothDeviceUpdater.java | 4 +-- src/com/android/settings/bluetooth/Utils.java | 6 ++--- .../AddDevicePreferenceController.java | 6 ++--- .../AdvancedConnectedDeviceController.java | 4 +-- .../AvailableMediaDeviceGroupController.java | 10 ++++---- .../ConnectedDeviceGroupController.java | 10 ++++---- ...iscoverableFooterPreferenceController.java | 6 ++--- ...lyConnectedDevicePreferenceController.java | 8 +++--- .../SavedDeviceGroupController.java | 10 ++++---- .../usb/ConnectedUsbDeviceUpdater.java | 6 ++--- .../usb/UsbDefaultFragment.java | 4 +-- .../usb/UsbDetailsController.java | 6 ++--- .../usb/UsbDetailsDataRoleController.java | 6 ++--- .../usb/UsbDetailsFragment.java | 4 +-- .../usb/UsbDetailsFunctionsController.java | 6 ++--- .../usb/UsbDetailsHeaderController.java | 4 +-- .../usb/UsbDetailsPowerRoleController.java | 6 ++--- .../core/BasePreferenceController.java | 6 ++--- .../core/InstrumentedPreferenceFragment.java | 6 ++--- .../core/SliderPreferenceController.java | 4 +-- .../settings/core/SubSettingLauncher.java | 6 ++--- .../core/TogglePreferenceController.java | 6 ++--- .../dashboard/DashboardFragmentRegistry.java | 1 - .../dashboard/DashboardItemAnimator.java | 4 +-- .../settings/dashboard/DashboardSummary.java | 2 +- ...rdTilePlaceholderPreferenceController.java | 6 ++--- .../RestrictedDashboardFragment.java | 4 +-- .../suggestions/SuggestionAdapter.java | 6 ++--- .../suggestions/SuggestionStateProvider.java | 4 +-- .../settings/datausage/AppDataUsage.java | 12 ++++----- .../datausage/AppDataUsagePreference.java | 4 +-- .../settings/datausage/AppPrefLoader.java | 4 +-- .../datausage/BillingCyclePreference.java | 4 +-- .../datausage/BillingCycleSettings.java | 12 ++++----- .../datausage/CellDataPreference.java | 10 ++++---- .../datausage/ChartDataUsagePreference.java | 8 +++--- .../datausage/DataSaverPreference.java | 4 +-- .../settings/datausage/DataSaverSummary.java | 4 +-- .../settings/datausage/DataUsageList.java | 12 ++++----- .../datausage/DataUsagePreference.java | 8 +++--- .../settings/datausage/DataUsageSummary.java | 8 +++--- .../datausage/DataUsageSummaryPreference.java | 8 +++--- .../DataUsageSummaryPreferenceController.java | 8 +++--- .../settings/datausage/SpinnerPreference.java | 4 +-- .../UnrestrictedDataAccessPreference.java | 4 +-- ...trictedDataAccessPreferenceController.java | 8 +++--- .../AutoTimeFormatPreferenceController.java | 8 +++--- .../AutoTimePreferenceController.java | 4 +-- .../AutoTimeZonePreferenceController.java | 6 ++--- .../datetime/DatePreferenceController.java | 6 ++--- .../TimeFormatPreferenceController.java | 8 +++--- .../datetime/TimePreferenceController.java | 4 +-- .../TimeZonePreferenceController.java | 6 ++--- .../timezone/BaseTimeZoneAdapter.java | 12 ++++----- .../timezone/BaseTimeZoneInfoPicker.java | 4 +-- .../datetime/timezone/BaseTimeZonePicker.java | 6 ++--- .../BaseTimeZonePreferenceController.java | 4 +-- .../datetime/timezone/RegionSearchPicker.java | 4 +-- .../datetime/timezone/RegionZonePicker.java | 6 ++--- .../RegionZonePreferenceController.java | 4 +-- .../TimeZoneInfoPreferenceController.java | 6 ++--- .../datetime/timezone/TimeZoneSettings.java | 6 ++--- .../datetime/timezone/model/TimeZoneData.java | 6 ++--- .../timezone/model/TimeZoneDataLoader.java | 4 +-- .../ActivationWarningFragment.java | 4 +-- ...anagerDescriptionPreferenceController.java | 6 ++--- .../AutomaticStorageManagerSettings.java | 8 +++--- ...aticStorageManagerSwitchBarController.java | 6 ++--- ...ractBluetoothA2dpPreferenceController.java | 10 ++++---- .../development/AdbPreferenceController.java | 6 ++--- ...lowAppsOnExternalPreferenceController.java | 6 ++--- ...atorDurationScalePreferenceController.java | 8 +++--- ...AppsNotRespondingPreferenceController.java | 6 ++--- ...roundProcessLimitPreferenceController.java | 8 +++--- ...oothA2dpHwOffloadPreferenceController.java | 6 ++--- .../BluetoothA2dpHwOffloadRebootDialog.java | 6 ++--- ...othAbsoluteVolumePreferenceController.java | 6 ++--- ...toothAvrcpVersionPreferenceController.java | 8 +++--- ...toothDeviceNoNamePreferenceController.java | 6 ++--- ...ectedAudioDevicesPreferenceController.java | 6 ++--- ...BluetoothSnoopLogPreferenceController.java | 6 ++--- .../BugReportInPowerPreferenceController.java | 6 ++--- ...CameraLaserSensorPreferenceController.java | 8 +++--- .../ClearAdbKeysPreferenceController.java | 8 +++--- .../ClearAdbKeysWarningDialog.java | 8 +++--- .../development/ColorModePreference.java | 4 +-- ...lColorTemperaturePreferenceController.java | 8 +++--- .../DebugGpuOverdrawPreferenceController.java | 6 ++--- ...ectClipOperationsPreferenceController.java | 6 ++--- ...bugViewAttributesPreferenceController.java | 6 ++--- .../DevelopmentSettingsDashboardFragment.java | 6 ++--- .../DevelopmentSwitchBarController.java | 4 +-- ...eAutomaticUpdatesPreferenceController.java | 6 ++--- .../DisableLogPersistWarningDialog.java | 8 +++--- ...lateDisplayCutoutPreferenceController.java | 10 ++++---- .../development/EnableAdbWarningDialog.java | 8 +++--- ...EnableDevelopmentSettingWarningDialog.java | 6 ++--- ...wMeasFullTrackingPreferenceController.java | 6 ++--- ...bleGpuDebugLayersPreferenceController.java | 6 ++--- .../EnableOemUnlockSettingWarningDialog.java | 8 +++--- .../FileEncryptionPreferenceController.java | 6 ++--- .../ForceMSAAPreferenceController.java | 8 +++--- .../FreeformWindowsPreferenceController.java | 6 ++--- ...obalSettingSwitchPreferenceController.java | 6 ++--- .../GpuViewUpdatesPreferenceController.java | 6 ++--- ...wareLayersUpdatesPreferenceController.java | 6 ++--- .../HardwareOverlaysPreferenceController.java | 6 ++--- .../HdcpCheckingPreferenceController.java | 8 +++--- ...hFrequencyDisplayPreferenceController.java | 9 +++---- .../KeepActivitiesPreferenceController.java | 6 ++--- ...calBackupPasswordPreferenceController.java | 6 ++--- .../LocalTerminalPreferenceController.java | 6 ++--- .../LogPersistPreferenceController.java | 6 ++--- .../LogdSizePreferenceController.java | 4 +-- .../MemoryUsagePreferenceController.java | 8 +++--- ...obileDataAlwaysOnPreferenceController.java | 6 ++--- .../MockLocationAppPreferenceController.java | 4 +-- ...onChannelWarningsPreferenceController.java | 6 ++--- .../development/OemLockInfoDialog.java | 8 +++--- .../OemUnlockPreferenceController.java | 8 +++--- .../PictureColorModePreferenceController.java | 6 ++--- .../PointerLocationPreferenceController.java | 6 ++--- ...ofileGpuRenderingPreferenceController.java | 6 ++--- ...ResizableActivityPreferenceController.java | 6 ++--- .../RtlLayoutPreferenceController.java | 8 +++--- .../SecondaryDisplayPreferenceController.java | 6 ++--- ...cureSettingSwitchPreferenceController.java | 6 ++--- .../SelectDebugAppPreferenceController.java | 6 ++--- ...ManagerThrottlingPreferenceController.java | 4 +-- ...wFirstCrashDialogPreferenceController.java | 6 ++--- .../ShowLayoutBoundsPreferenceController.java | 6 ++--- ...howSurfaceUpdatesPreferenceController.java | 6 ++--- .../ShowTapsPreferenceController.java | 6 ++--- ...imulateColorSpacePreferenceController.java | 8 +++--- .../StayAwakePreferenceController.java | 8 +++--- .../StrictModePreferenceController.java | 6 ++--- ...stemSettingSwitchPreferenceController.java | 6 ++--- ...ringHardwareAccelPreferenceController.java | 6 ++--- ...ionAnimationScalePreferenceController.java | 8 +++--- .../UsbAudioRoutingPreferenceController.java | 6 ++--- ...VerifyAppsOverUsbPreferenceController.java | 6 ++--- .../WaitForDebuggerPreferenceController.java | 6 ++--- .../WebViewAppPreferenceController.java | 6 ++--- ...dMacRandomizationPreferenceController.java | 8 +++--- ...playCertificationPreferenceController.java | 6 ++--- ...ifiVerboseLoggingPreferenceController.java | 6 ++--- ...dowAnimationScalePreferenceController.java | 8 +++--- .../AbstractGlobalSettingsPreference.java | 9 ------- ...ofillLoggingLevelPreferenceController.java | 6 ++--- .../AutofillMaxPartitionsPreference.java | 2 -- .../autofill/AutofillPreferenceCategory.java | 1 - ...ofillResetOptionsPreferenceController.java | 6 ++--- .../featureflags/FeatureFlagPersistent.java | 4 +-- .../FeatureFlagsPreferenceController.java | 6 ++--- .../DevelopmentTilePreferenceController.java | 10 ++++---- .../development/qstile/DevelopmentTiles.java | 4 +-- .../BrandedAccountPreferenceController.java | 6 ++--- .../BuildNumberPreferenceController.java | 8 +++--- .../DeviceModelPreferenceController.java | 8 +++--- .../DeviceNamePreferenceController.java | 8 +++--- .../FccEquipmentIdPreferenceController.java | 6 ++--- .../FeedbackPreferenceController.java | 6 ++--- .../HardwareInfoDialogFragment.java | 6 ++--- .../KernelVersionPreferenceController.java | 4 +-- .../PhoneNumberPreferenceController.java | 8 +++--- .../deviceinfo/PrivateVolumeForget.java | 8 +++--- .../deviceinfo/PrivateVolumeFormat.java | 1 + .../deviceinfo/PrivateVolumeSettings.java | 14 +++++------ .../deviceinfo/PublicVolumeSettings.java | 6 ++--- .../deviceinfo/StorageDashboardFragment.java | 8 +++--- .../deviceinfo/StorageItemPreference.java | 6 ++--- .../deviceinfo/StorageProfileFragment.java | 8 +++--- .../settings/deviceinfo/StorageSettings.java | 14 +++++------ .../deviceinfo/StorageSummaryPreference.java | 4 +-- .../deviceinfo/StorageVolumePreference.java | 6 ++--- .../deviceinfo/StorageWizardBase.java | 5 ++-- .../StorageWizardFormatConfirm.java | 7 +++--- .../StorageWizardFormatProgress.java | 1 + .../StorageWizardMigrateProgress.java | 1 + .../deviceinfo/StorageWizardMoveConfirm.java | 1 + .../deviceinfo/StorageWizardMoveProgress.java | 1 + .../aboutphone/DeviceNameWarningDialog.java | 6 ++--- .../BasebandVersionDialogController.java | 4 +-- .../BuildNumberDialogController.java | 4 +-- .../FirmwareVersionDialogController.java | 4 +-- .../FirmwareVersionDialogFragment.java | 8 +++--- .../FirmwareVersionPreferenceController.java | 4 +-- .../KernelVersionDialogController.java | 4 +-- .../SecurityPatchLevelDialogController.java | 4 +-- .../imei/ImeiInfoDialogController.java | 6 ++--- .../imei/ImeiInfoDialogFragment.java | 8 +++--- .../imei/ImeiInfoPreferenceController.java | 10 ++++---- .../legal/LegalPreferenceController.java | 6 ++--- .../simstatus/SimStatusDialogController.java | 6 ++--- .../simstatus/SimStatusDialogFragment.java | 8 +++--- .../SimStatusPreferenceController.java | 10 ++++---- ...eManagementSwitchPreferenceController.java | 8 +++--- .../storage/CachedStorageValuesHelper.java | 4 +-- .../storage/SecondaryUserController.java | 12 ++++----- .../StorageItemPreferenceController.java | 10 ++++---- .../StorageSummaryDonutPreference.java | 6 ++--- ...orageSummaryDonutPreferenceController.java | 6 ++--- .../storage/UserProfileController.java | 6 ++--- .../deviceinfo/storage/VolumeSizesLoader.java | 4 +-- ...playNotificationsPreferenceController.java | 7 +++--- .../android/settings/display/AppGridView.java | 4 +-- .../AutoRotatePreferenceController.java | 4 +-- ...BatteryPercentagePreferenceController.java | 6 ++--- .../BrightnessLevelPreferenceController.java | 8 +++--- .../CameraGesturePreferenceController.java | 6 ++--- .../ColorModePreferenceController.java | 4 +-- .../display/ColorModePreferenceFragment.java | 6 ++--- .../display/DarkUIPreferenceController.java | 6 ++--- .../LiftToWakePreferenceController.java | 6 ++--- ...DisplayActivationPreferenceController.java | 6 ++--- ...htDisplayAutoModePreferenceController.java | 8 +++--- ...playCustomEndTimePreferenceController.java | 4 +-- ...ayCustomStartTimePreferenceController.java | 4 +-- ...ightDisplayFooterPreferenceController.java | 4 +-- ...tDisplayIntensityPreferenceController.java | 6 ++--- .../display/NightDisplayPreference.java | 4 +-- .../display/NightDisplaySettings.java | 4 +-- .../NightModePreferenceController.java | 6 ++--- .../ScreenSaverPreferenceController.java | 4 +-- .../display/ScreenZoomPreference.java | 4 +-- .../ShowOperatorNamePreferenceController.java | 6 ++--- .../TapToWakePreferenceController.java | 6 ++--- .../display/ThemePreferenceController.java | 8 +++--- .../display/TimeoutListPreference.java | 4 +-- .../display/TimeoutPreferenceController.java | 4 +-- .../VrDisplayPreferenceController.java | 4 +-- .../WallpaperPreferenceController.java | 4 +-- .../CurrentDreamPreferenceController.java | 4 +-- .../android/settings/dream/DreamSettings.java | 4 +-- .../dream/StartNowPreferenceController.java | 6 ++--- .../WhenToDreamPreferenceController.java | 4 +-- .../ActionDisabledByAdminDialogHelper.java | 6 ++--- .../AdminActionPreferenceControllerBase.java | 4 +-- ...edPermissionsPreferenceControllerBase.java | 4 +-- ...sOnVpnCurrentUserPreferenceController.java | 4 +-- .../ApplicationListPreferenceController.java | 6 ++--- ...aCertsCurrentUserPreferenceController.java | 4 +-- .../CaCertsPreferenceControllerBase.java | 4 +-- ...InstalledPackagesPreferenceController.java | 4 +-- ...EnterprisePrivacyPreferenceController.java | 4 +-- ...etDefaultAppsListPreferenceController.java | 10 ++++---- ...iseSetDefaultAppsPreferenceController.java | 4 +-- ...dPasswordWipePreferenceControllerBase.java | 4 +-- .../enterprise/ImePreferenceController.java | 4 +-- .../flashlight/FlashlightSliceBuilder.java | 11 ++++---- .../fuelgauge/AdvancedPowerUsageDetail.java | 8 +++--- .../AutoRestrictionPreferenceController.java | 6 ++--- ...ackgroundActivityPreferenceController.java | 6 ++--- .../BatteryAppListPreferenceController.java | 10 ++++---- .../fuelgauge/BatteryBroadcastReceiver.java | 6 ++--- .../BatteryHeaderPreferenceController.java | 9 +++---- .../fuelgauge/BatteryHistoryPreference.java | 8 +++--- .../settings/fuelgauge/BatteryInfo.java | 4 +-- .../settings/fuelgauge/BatteryInfoLoader.java | 4 +-- .../settings/fuelgauge/BatteryMeterView.java | 4 +-- ...tteryOptimizationPreferenceController.java | 6 ++--- .../fuelgauge/BatteryStatsHelperLoader.java | 4 +-- .../settings/fuelgauge/BatteryUtils.java | 12 ++++----- .../settings/fuelgauge/HighPowerDetail.java | 8 +++--- .../settings/fuelgauge/InactiveApps.java | 8 +++--- .../fuelgauge/PowerGaugePreference.java | 4 +-- .../fuelgauge/PowerUsageAdvanced.java | 4 +-- .../settings/fuelgauge/PowerUsageBase.java | 6 ++--- .../RestrictAppPreferenceController.java | 6 ++--- .../fuelgauge/RestrictedAppDetails.java | 10 ++++---- .../SmartBatteryPreferenceController.java | 6 ++--- .../AutoBatterySaverPreferenceController.java | 6 ++--- ...utoBatterySeekBarPreferenceController.java | 8 +++--- ...atterySaverButtonPreferenceController.java | 6 ++--- .../batterytip/AnomalyCleanupJobService.java | 4 +-- .../batterytip/AnomalyConfigJobService.java | 4 +-- .../batterytip/AnomalyDatabaseHelper.java | 4 +-- .../AnomalyDetectionJobService.java | 6 ++--- .../fuelgauge/batterytip/AppInfo.java | 4 +-- .../batterytip/BatteryDatabaseManager.java | 8 +++--- .../BatteryManagerPreferenceController.java | 6 ++--- .../batterytip/BatteryTipDialogFragment.java | 10 ++++---- .../batterytip/BatteryTipLoader.java | 4 +-- .../batterytip/BatteryTipPolicy.java | 4 +-- .../BatteryTipPreferenceController.java | 10 ++++---- .../fuelgauge/batterytip/BatteryTipUtils.java | 4 +-- .../batterytip/HighUsageAdapter.java | 4 +-- .../batterytip/StatsManagerConfig.java | 4 +-- .../OpenRestrictAppFragmentAction.java | 4 +-- .../batterytip/actions/RestrictAppAction.java | 4 +-- .../actions/SmartBatteryAction.java | 4 +-- .../actions/UnrestrictAppAction.java | 4 +-- .../detectors/HighUsageDetector.java | 4 +-- .../detectors/RestrictAppDetector.java | 5 ++-- .../fuelgauge/batterytip/tips/BatteryTip.java | 10 ++++---- .../batterytip/tips/HighUsageTip.java | 4 +-- .../batterytip/tips/RestrictAppTip.java | 4 +-- .../fuelgauge/batterytip/tips/SummaryTip.java | 4 +-- .../batterytip/tips/UnrestrictAppTip.java | 4 +-- .../DoubleTapScreenPreferenceController.java | 4 +-- .../DoubleTwistPreferenceController.java | 4 +-- .../gestures/GesturePreferenceController.java | 8 +++--- .../GesturesSettingPreferenceController.java | 4 +-- .../PickupGesturePreferenceController.java | 2 -- .../PreventRingingPreferenceController.java | 10 ++++---- .../ReachGesturePreferenceController.java | 1 - .../GameControllerPreferenceController.java | 6 ++--- ...tMethodAndSubtypePreferenceController.java | 6 ++--- .../KeyboardLayoutDialogFragment.java | 10 ++++---- .../KeyboardLayoutPickerController.java | 10 ++++---- .../inputmethod/PhysicalKeyboardFragment.java | 12 ++++----- .../PhysicalKeyboardPreferenceController.java | 4 +-- .../inputmethod/SpellCheckerPreference.java | 6 ++--- .../SpellCheckerPreferenceController.java | 6 ++--- .../inputmethod/SpellCheckersSettings.java | 12 ++++----- .../UserDictionaryCursorLoader.java | 6 ++--- ...serDictionaryListPreferenceController.java | 10 ++++---- .../inputmethod/UserDictionarySettings.java | 8 +++--- .../VirtualKeyboardPreferenceController.java | 4 +-- .../PhoneLanguagePreferenceController.java | 4 +-- .../language/PointerSpeedController.java | 4 +-- .../UserDictionaryPreferenceController.java | 6 ++--- .../LocaleDragAndDropAdapter.java | 8 +++--- .../LocaleLinearLayoutManager.java | 4 +-- .../localepicker/LocaleListEditor.java | 6 ++--- .../location/AppSettingsInjector.java | 2 -- ...BluetoothScanningPreferenceController.java | 6 ++--- .../settings/location/LocationEnabler.java | 4 +-- .../LocationFooterPreferenceController.java | 8 +++--- .../LocationForWorkPreferenceController.java | 6 ++--- .../LocationPreferenceController.java | 8 +++--- .../LocationScanningPreferenceController.java | 4 +-- .../LocationServicePreferenceController.java | 10 ++++---- .../location/LocationSliceBuilder.java | 13 +++++----- ...ntLocationRequestPreferenceController.java | 10 ++++---- ...tionRequestSeeAllPreferenceController.java | 10 ++++---- .../WifiScanningPreferenceController.java | 6 ++--- .../Enhanced4gLteSliceHelper.java | 14 +++++------ .../AirplaneModePreferenceController.java | 10 ++++---- .../android/settings/network/ApnEditor.java | 18 ++++++------- .../settings/network/ApnPreference.java | 4 +-- .../android/settings/network/ApnSettings.java | 6 ++--- .../MobileNetworkPreferenceController.java | 8 +++--- .../MobilePlanPreferenceController.java | 5 ++-- .../network/NetworkDashboardFragment.java | 8 +++--- .../NetworkResetRestrictionChecker.java | 4 +-- .../settings/network/NetworkScorerPicker.java | 8 +++--- ...tworkScorerPickerPreferenceController.java | 4 +-- .../PrivateDnsModeDialogPreference.java | 6 ++--- .../PrivateDnsPreferenceController.java | 6 ++--- .../network/ProxyPreferenceController.java | 6 ++--- .../network/TetherPreferenceController.java | 9 ++++--- .../network/VpnPreferenceController.java | 8 +++--- .../nfc/AndroidBeamPreferenceController.java | 4 +-- .../NfcForegroundPreferenceController.java | 8 +++--- .../settings/nfc/NfcPaymentPreference.java | 4 +-- .../nfc/NfcPaymentPreferenceController.java | 10 ++++---- .../settings/nfc/NfcPreferenceController.java | 8 +++--- ...ModeAutomaticRulePreferenceController.java | 6 ++--- .../AbstractZenModePreferenceController.java | 8 +++--- ...tVolumeRestrictedPreferenceController.java | 6 ++--- .../AllowSoundPreferenceController.java | 4 +-- .../AppLinkPreferenceController.java | 4 +-- .../notification/AppNotificationSettings.java | 12 ++++----- .../BadgePreferenceController.java | 4 +-- ...dgingNotificationPreferenceController.java | 8 +++--- .../BlockPreferenceController.java | 4 +-- .../BootSoundPreferenceController.java | 6 ++--- .../ChannelGroupNotificationSettings.java | 4 +-- .../ChannelNotificationSettings.java | 4 +-- .../ConfigureNotificationSettings.java | 8 +++--- .../DeletedChannelsPreferenceController.java | 4 +-- .../DescriptionPreferenceController.java | 4 +-- .../notification/DndPreferenceController.java | 4 +-- ...mergencyBroadcastPreferenceController.java | 6 ++--- .../HeaderPreferenceController.java | 10 ++++---- .../ImportancePreferenceController.java | 4 +-- .../LightsPreferenceController.java | 4 +-- ...creenNotificationPreferenceController.java | 6 ++--- .../NotificationAccessSettings.java | 10 ++++---- .../NotificationAppPreference.java | 4 +-- .../notification/NotificationBackend.java | 4 +-- .../NotificationFooterPreference.java | 4 +-- .../NotificationLockscreenPreference.java | 6 ++--- .../NotificationPreferenceController.java | 6 ++--- .../NotificationSettingsBase.java | 9 ++++--- .../notification/NotificationStation.java | 8 +++--- .../NotificationSwitchBarPreference.java | 4 +-- .../NotificationsOffPreferenceController.java | 4 +-- ...PulseNotificationPreferenceController.java | 6 ++--- ...centNotifyingAppsPreferenceController.java | 12 ++++----- .../notification/RedactionInterstitial.java | 1 + .../RingVolumePreferenceController.java | 4 +-- .../RingtonePreferenceControllerBase.java | 4 +-- .../settings/notification/SettingPref.java | 4 +-- .../notification/SettingPrefController.java | 8 +++--- .../SoundPreferenceController.java | 6 ++--- .../settings/notification/SoundSettings.java | 8 +++--- .../VibrateWhenRingPreferenceController.java | 6 ++--- .../VibrationPreferenceController.java | 4 +-- .../VisibilityPreferenceController.java | 4 +-- .../notification/VolumeSeekBarPreference.java | 6 ++--- .../VolumeSeekBarPreferenceController.java | 6 ++--- .../WorkSoundPreferenceController.java | 18 ++++++------- .../notification/ZenAccessSettings.java | 14 +++++------ ...tomaticRuleHeaderPreferenceController.java | 8 +++--- ...tomaticRuleSwitchPreferenceController.java | 8 +++--- .../ZenCustomRadioButtonPreference.java | 4 +-- .../notification/ZenDeleteRuleDialog.java | 6 ++--- .../ZenDurationDialogPreference.java | 4 +-- .../ZenFooterPreferenceController.java | 6 ++--- ...eAddAutomaticRulePreferenceController.java | 6 ++--- .../ZenModeAlarmsPreferenceController.java | 6 ++--- ...odeAutomaticRulesPreferenceController.java | 8 +++--- ...ZenModeAutomationPreferenceController.java | 4 +-- .../ZenModeAutomationSettings.java | 4 +-- .../settings/notification/ZenModeBackend.java | 4 +-- ...ModeBehaviorCallsPreferenceController.java | 4 +-- ...odeBehaviorFooterPreferenceController.java | 4 +-- ...rMsgEventReminderPreferenceController.java | 4 +-- ...ModeBehaviorSoundPreferenceController.java | 4 +-- .../ZenModeButtonPreferenceController.java | 6 ++--- .../ZenModeCallsPreferenceController.java | 6 ++--- .../ZenModeEventRuleSettings.java | 10 ++++---- .../ZenModeEventsPreferenceController.java | 6 ++--- .../ZenModeMediaPreferenceController.java | 4 +-- .../ZenModeMessagesPreferenceController.java | 6 ++--- .../ZenModePreferenceController.java | 6 ++--- .../ZenModeRemindersPreferenceController.java | 6 ++--- ...ModeRepeatCallersPreferenceController.java | 8 +++--- .../notification/ZenModeRuleSettingsBase.java | 6 ++--- .../ZenModeScheduleRuleSettings.java | 14 +++++------ .../notification/ZenModeSettings.java | 6 ++--- ...odeSettingsFooterPreferenceController.java | 4 +-- .../notification/ZenModeSliceBuilder.java | 12 ++++----- ...deStarredContactsPreferenceController.java | 8 +++--- .../ZenModeSystemPreferenceController.java | 6 ++--- .../ZenModeVisEffectPreferenceController.java | 8 +++--- ...ModeVisEffectsAllPreferenceController.java | 6 ++--- ...eVisEffectsCustomPreferenceController.java | 6 ++--- ...odeVisEffectsNonePreferenceController.java | 6 ++--- .../notification/ZenOnboardingActivity.java | 4 +-- .../notification/ZenRuleNameDialog.java | 6 ++--- .../notification/ZenRulePreference.java | 8 +++--- .../notification/ZenRuleSelectionDialog.java | 6 ++--- .../settings/password/ChooseLockGeneric.java | 17 +++++++------ .../password/ChooseLockGenericController.java | 6 ++--- .../settings/password/ChooseLockPassword.java | 10 ++++---- .../settings/password/ChooseLockPattern.java | 4 +-- .../password/ChooseLockSettingsHelper.java | 6 ++--- .../ChooseLockTypeDialogFragment.java | 6 ++--- .../ConfirmDeviceCredentialBaseActivity.java | 4 +-- .../ConfirmDeviceCredentialBaseFragment.java | 8 +++--- .../password/ConfirmLockPassword.java | 4 +-- .../password/PasswordRequirementAdapter.java | 4 +-- .../password/SaveChosenLockWorkerBase.java | 4 +-- .../password/SetNewPasswordController.java | 5 ++-- .../password/SetupChooseLockGeneric.java | 8 +++--- .../password/SetupChooseLockPassword.java | 6 ++--- .../password/SetupChooseLockPattern.java | 6 ++--- .../settings/password/SetupSkipDialog.java | 8 +++--- .../print/PrintJobSettingsFragment.java | 4 +-- .../print/PrintServiceSettingsFragment.java | 12 ++++----- .../PrintSettingPreferenceController.java | 6 ++--- .../print/SettingsPrintServicesLoader.java | 4 +-- .../search/DeviceIndexUpdateJobService.java | 15 +++++------ .../android/settings/search/Indexable.java | 4 +-- .../SettingsSearchIndexablesProvider.java | 1 + .../actionbar/SearchMenuController.java | 4 +-- ...ProfileScreenLockPreferenceController.java | 4 +-- .../ChangeScreenLockPreferenceController.java | 6 ++--- .../security/ConfigureKeyGuardDialog.java | 6 ++--- ...CredentialStoragePreferenceController.java | 4 +-- .../security/CryptKeeperSettings.java | 6 ++--- .../EncryptionStatusPreferenceController.java | 4 +-- .../LockUnificationPreferenceController.java | 6 ++--- .../OwnerInfoPreferenceController.java | 12 ++++----- .../ResetCredentialsPreferenceController.java | 4 +-- .../security/ScreenPinningSettings.java | 10 ++++---- .../security/SimLockPreferenceController.java | 6 ++--- .../UnificationConfirmationDialog.java | 6 ++--- ...blePatternProfilePreferenceController.java | 6 ++--- .../LockAfterTimeoutPreferenceController.java | 4 +-- .../LockScreenPreferenceController.java | 6 ++--- .../PatternVisiblePreferenceController.java | 6 ++--- ...ButtonInstantLockPreferenceController.java | 6 ++--- ...ManageTrustAgentsPreferenceController.java | 6 ++--- .../TrustAgentListPreferenceController.java | 10 ++++---- .../trustagent/TrustAgentManager.java | 4 +-- .../TrustAgentsPreferenceController.java | 8 +++--- .../CreateShortcutPreferenceController.java | 10 ++++---- .../settings/sim/SimDialogActivity.java | 4 +-- .../settings/sim/SimPreferenceDialog.java | 4 +-- .../settings/sim/SimSelectNotification.java | 4 +-- src/com/android/settings/sim/SimSettings.java | 6 ++--- .../settings/slices/CustomSliceable.java | 4 +-- .../slices/SettingsSliceProvider.java | 9 +++---- .../settings/slices/SliceBuilderUtils.java | 17 ++++++------- .../settings/slices/SliceDataConverter.java | 4 +-- .../slices/SliceDeepLinkSpringBoard.java | 2 -- .../settings/slices/SliceRelayReceiver.java | 1 + .../slices/SlicesDatabaseAccessor.java | 4 +-- .../settings/slices/SlicesDatabaseHelper.java | 4 +-- .../settings/slices/SlicesIndexer.java | 4 +-- .../AudioSwitchPreferenceController.java | 8 +++--- ...FreeProfileOutputPreferenceController.java | 4 +-- .../MediaOutputPreferenceController.java | 4 +-- .../support/actionbar/HelpMenuController.java | 4 +-- .../android/settings/survey/SurveyMixin.java | 4 +-- .../SystemUpdatePreferenceController.java | 6 ++--- .../settings/tts/TtsEnginePreference.java | 6 ++--- .../tts/TtsEnginePreferenceFragment.java | 4 +-- ...AddUserWhenLockedPreferenceController.java | 4 +-- .../users/AppRestrictionsFragment.java | 18 ++++++------- .../AutoSyncDataPreferenceController.java | 10 ++++---- .../AutoSyncWorkDataPreferenceController.java | 4 +-- .../users/EditUserInfoController.java | 8 +++--- .../users/EditUserPhotoController.java | 6 ++--- .../MultiUserFooterPreferenceController.java | 6 ++--- .../settings/users/OwnerInfoSettings.java | 6 ++--- .../settings/users/UserDetailsSettings.java | 6 ++--- .../android/settings/users/UserDialogs.java | 4 +-- .../settings/users/UserPreference.java | 4 +-- .../utils/ManagedServiceSettings.java | 10 ++++---- .../utils/SettingsDividerItemDecoration.java | 4 +-- src/com/android/settings/vpn2/AppDialog.java | 4 +-- .../settings/vpn2/AppDialogFragment.java | 6 ++--- .../settings/vpn2/AppManagementFragment.java | 10 ++++---- .../android/settings/vpn2/AppPreference.java | 4 +-- .../android/settings/vpn2/ConfigDialog.java | 4 +-- .../settings/vpn2/ConfigDialogFragment.java | 4 +-- .../vpn2/ConfirmLockdownFragment.java | 6 ++--- .../settings/vpn2/LegacyVpnPreference.java | 4 +-- .../android/settings/vpn2/VpnSettings.java | 8 +++--- .../WallpaperSuggestionActivity.java | 4 +-- .../WallpaperTypePreferenceController.java | 6 ++--- .../settings/webview/WebViewAppPicker.java | 4 +-- .../settings/wfd/WifiDisplaySettings.java | 20 +++++++-------- .../widget/ActionBarShadowController.java | 6 ++--- .../widget/ActionButtonPreference.java | 4 +-- .../widget/AppCheckBoxPreference.java | 4 +-- .../settings/widget/AppPreference.java | 4 +-- .../settings/widget/AppSwitchPreference.java | 4 +-- .../widget/AspectRatioFrameLayout.java | 4 +-- .../settings/widget/BottomLabelLayout.java | 4 +-- .../android/settings/widget/DonutView.java | 6 ++--- .../settings/widget/DotsPageIndicator.java | 4 +-- .../widget/EntityHeaderController.java | 10 ++++---- .../widget/FixedLineSummaryPreference.java | 4 +-- .../settings/widget/GearPreference.java | 4 +-- .../HighlightablePreferenceGroupAdapter.java | 6 ++--- .../settings/widget/LabeledSeekBar.java | 4 +-- .../widget/MasterCheckBoxPreference.java | 4 +-- .../widget/MasterSwitchController.java | 4 +-- .../widget/MasterSwitchPreference.java | 4 +-- .../widget/RadioButtonPickerFragment.java | 10 ++++---- .../widget/RadioButtonPreference.java | 4 +-- .../widget/RestrictedAppPreference.java | 6 ++--- .../widget/RtlCompatibleViewPager.java | 4 +-- .../settings/widget/SeekBarPreference.java | 4 +-- .../widget/SingleTargetGearPreference.java | 4 +-- .../settings/widget/SlidingTabLayout.java | 4 +-- .../android/settings/widget/SwitchBar.java | 8 +++--- .../widget/TwoStateButtonPreference.java | 6 ++--- ...UpdatableListPreferenceDialogFragment.java | 8 +++--- .../android/settings/widget/UsageGraph.java | 4 +-- .../widget/ValidatedEditTextPreference.java | 4 +-- .../settings/widget/VideoPreference.java | 4 +-- .../widget/VideoPreferenceController.java | 4 +-- .../settings/widget/WorkOnlyCategory.java | 4 +-- .../CellularFallbackPreferenceController.java | 6 ++--- .../settings/wifi/ChangeWifiStateDetails.java | 10 ++++---- .../wifi/ConnectedAccessPointPreference.java | 6 ++--- .../wifi/LongPressAccessPointPreference.java | 6 ++--- ...otifyOpenNetworksPreferenceController.java | 8 +++--- .../wifi/RequestToggleWiFiActivity.java | 4 +-- .../wifi/UseOpenWifiPreferenceController.java | 10 ++++---- .../android/settings/wifi/WifiAPITest.java | 8 +++--- .../settings/wifi/WifiConfigController.java | 4 +-- .../settings/wifi/WifiDetailPreference.java | 4 +-- src/com/android/settings/wifi/WifiDialog.java | 4 +-- .../settings/wifi/WifiDialogActivity.java | 4 +-- .../android/settings/wifi/WifiEnabler.java | 4 +-- .../wifi/WifiInfoPreferenceController.java | 8 +++--- .../WifiMasterSwitchPreferenceController.java | 4 +-- .../settings/wifi/WifiPickerActivity.java | 4 +-- .../settings/wifi/WifiScanModeActivity.java | 8 +++--- .../wifi/WifiScanningRequiredFragment.java | 6 ++--- src/com/android/settings/wifi/WifiSlice.java | 15 ++++++----- .../settings/wifi/WifiSummaryUpdater.java | 4 +-- .../wifi/WifiWakeupPreferenceController.java | 12 ++++----- .../wifi/WriteWifiConfigToNfcDialog.java | 4 +-- .../wifi/calling/WifiCallingSettings.java | 8 +++--- .../calling/WifiCallingSettingsForSub.java | 12 ++++----- .../wifi/calling/WifiCallingSliceHelper.java | 14 +++++------ .../WifiDetailPreferenceController.java | 14 +++++------ .../WifiMeteredPreferenceController.java | 6 ++--- .../p2p/P2pCategoryPreferenceController.java | 6 ++--- .../P2pThisDevicePreferenceController.java | 6 ++--- .../settings/wifi/p2p/WifiP2pPeer.java | 4 +-- .../wifi/p2p/WifiP2pPreferenceController.java | 8 +++--- .../settings/wifi/p2p/WifiP2pSettings.java | 8 +++--- .../settings/wifi/tether/TetherService.java | 4 +-- .../WifiTetherApBandPreferenceController.java | 4 +-- ...WifiTetherAutoOffPreferenceController.java | 4 +-- .../WifiTetherBasePreferenceController.java | 6 ++--- ...ifiTetherPasswordPreferenceController.java | 6 ++--- .../WifiTetherPreferenceController.java | 8 +++--- .../WifiTetherSSIDPreferenceController.java | 4 +-- ...ifiTetherSecurityPreferenceController.java | 4 +-- .../wifi/tether/WifiTetherSettings.java | 4 +-- .../tether/WifiTetherSwitchBarController.java | 4 +-- .../com/android/settings/MasterClearTest.java | 5 ++-- .../settings/ResetNetworkConfirmTest.java | 1 + .../RestrictedListPreferenceTest.java | 1 + .../RestrictedSettingsFragmentTest.java | 4 +-- .../settings/SettingsActivityTest.java | 10 +++++--- .../settings/SettingsDialogFragmentTest.java | 4 +-- .../settings/SettingsDumpServiceTest.java | 5 ++-- .../settings/SettingsLicenseActivityTest.java | 1 + .../SettingsPreferenceFragmentTest.java | 14 +++++------ .../settings/SetupWizardUtilsTest.java | 1 + .../settings/SummaryPreferenceTest.java | 4 +-- .../android/settings/TetherSettingsTest.java | 1 + .../src/com/android/settings/UtilsTest.java | 1 + ...ityHearingAidPreferenceControllerTest.java | 2 +- .../AccessibilitySettingsTest.java | 5 ++-- ...sibilitySlicePreferenceControllerTest.java | 1 + ...olorInversionPreferenceControllerTest.java | 5 ++-- ...backIntensityPreferenceControllerTest.java | 4 +-- ...ationGesturesPreferenceControllerTest.java | 5 ++-- ...icationNavbarPreferenceControllerTest.java | 6 +++-- ...tionIntensityPreferenceControllerTest.java | 10 +++++--- .../ShortcutServicePickerFragmentTest.java | 1 + .../ToggleFeaturePreferenceFragmentTest.java | 4 +-- .../VibrationPreferenceFragmentTest.java | 2 ++ ...AccountHeaderPreferenceControllerTest.java | 10 +++++--- .../AccountPreferenceControllerTest.java | 11 ++++---- .../AccountSyncPreferenceControllerTest.java | 5 ++-- .../accounts/AccountSyncSettingsTest.java | 4 +-- .../AccountTypePreferenceLoaderTest.java | 12 ++++----- ...ChooseAccountPreferenceControllerTest.java | 11 ++++---- ...ContactSearchPreferenceControllerTest.java | 2 ++ ...EmergencyInfoPreferenceControllerTest.java | 7 +++--- ...iseDisclosurePreferenceControllerTest.java | 7 +++--- .../accounts/ProviderPreferenceTest.java | 1 + ...RemoveAccountPreferenceControllerTest.java | 14 +++++------ .../WorkModePreferenceControllerTest.java | 5 ++-- .../applications/AppInfoWithHeaderTest.java | 9 ++++--- ...ppPermissionsPreferenceControllerTest.java | 5 ++-- .../AppStateNotificationBridgeTest.java | 4 +++ .../AppStorageSizesControllerTest.java | 5 ++-- ...ithAdminGrantedPermissionsCounterTest.java | 2 ++ ...WithAdminGrantedPermissionsListerTest.java | 2 ++ .../ApplicationFeatureProviderImplTest.java | 1 + .../applications/DefaultAppSettingsTest.java | 1 + .../FetchPackageStorageAsyncLoaderTest.java | 1 + .../applications/InstalledAppCounterTest.java | 2 ++ .../applications/InstalledAppListerTest.java | 2 ++ .../applications/LayoutPreferenceTest.java | 7 +++--- .../RecentAppsPreferenceControllerTest.java | 9 ++++--- .../applications/UsageAccessDetailsTest.java | 1 + .../AppBatteryPreferenceControllerTest.java | 9 ++++--- .../AppButtonsPreferenceControllerTest.java | 4 +-- .../AppDataUsagePreferenceControllerTest.java | 7 +++--- ...AppHeaderViewPreferenceControllerTest.java | 10 +++++--- .../appinfo/AppInfoDashboardFragmentTest.java | 2 ++ .../AppInfoPreferenceControllerBaseTest.java | 8 +++--- ...InstallerInfoPreferenceControllerTest.java | 5 ++-- .../AppMemoryPreferenceControllerTest.java | 7 +++--- ...pNotificationPreferenceControllerTest.java | 10 +++++--- ...OpenByDefaultPreferenceControllerTest.java | 7 +++--- .../AppSettingPreferenceControllerTest.java | 4 +-- .../AppStoragePreferenceControllerTest.java | 7 +++--- .../AppVersionPreferenceControllerTest.java | 4 +-- .../ButtonActionDialogFragmentTest.java | 7 +++--- ...pShortcutPreferenceControllerBaseTest.java | 7 +++--- ...owserShortcutPreferenceControllerTest.java | 1 + ...gencyShortcutPreferenceControllerTest.java | 1 + ...tHomeShortcutPreferenceControllerTest.java | 1 + ...PhoneShortcutPreferenceControllerTest.java | 1 + ...ltSmsShortcutPreferenceControllerTest.java | 1 + ...OverlayDetailPreferenceControllerTest.java | 6 +++-- .../appinfo/DrawOverlayDetailsTest.java | 6 ++--- ...lSourceDetailPreferenceControllerTest.java | 5 ++-- .../appinfo/ExternalSourcesDetailsTest.java | 1 + .../InstantAppButtonDialogFragmentTest.java | 7 +++--- ...antAppButtonsPreferenceControllerTest.java | 11 ++++---- ...antAppDomainsPreferenceControllerTest.java | 1 + ...imeSpentInAppPreferenceControllerTest.java | 8 +++--- ...ystemSettingsPreferenceControllerTest.java | 6 +++-- ...AssistContextPreferenceControllerTest.java | 10 +++++--- ...stFlashScreenPreferenceControllerTest.java | 10 +++++--- .../assist/DefaultAssistPickerTest.java | 1 + ...DefaultAssistPreferenceControllerTest.java | 1 + .../DefaultAppPickerFragmentTest.java | 7 +++--- .../DefaultAppPreferenceControllerTest.java | 5 ++-- .../DefaultAutofillPickerTest.java | 8 ++++-- ...faultAutofillPreferenceControllerTest.java | 5 ++-- ...efaultBrowserPreferenceControllerTest.java | 5 ++-- .../DefaultEmergencyPickerTest.java | 1 + .../defaultapps/DefaultHomePickerTest.java | 1 + .../DefaultHomePreferenceControllerTest.java | 5 ++-- ...ymentSettingsPreferenceControllerTest.java | 5 ++-- .../manageapplications/AppFilterItemTest.java | 7 ++++-- .../AppFilterRegistryTest.java | 1 + .../ApplicationViewHolderTest.java | 1 + .../ManageApplicationsTest.java | 9 ++++--- .../MusicViewHolderControllerTest.java | 5 ++-- .../PhotosViewHolderControllerTest.java | 5 ++-- .../DomainAppPreferenceControllerTest.java | 5 ++-- ...antAppAccountPreferenceControllerTest.java | 3 +++ ...tAppWebActionPreferenceControllerTest.java | 7 ++++-- .../DataSaverControllerTest.java | 1 + .../HighPowerAppsControllerTest.java | 1 + .../deviceadmin/DeviceAdminListItemTest.java | 1 + ...viceAdminListPreferenceControllerTest.java | 5 ++-- ...PictureDetailPreferenceControllerTest.java | 5 ++-- .../PictureInPictureDetailsTest.java | 1 + .../PictureInPictureSettingsTest.java | 1 + .../premiumsms/PremiumSmsAccessTest.java | 1 - .../premiumsms/PremiumSmsControllerTest.java | 2 ++ ...miumSmsScreenPreferenceControllerTest.java | 2 ++ .../EnabledVrListenersControllerTest.java | 1 + ...istenerScreenPreferenceControllerTest.java | 1 + .../AutoRestorePreferenceControllerTest.java | 4 +-- .../BackupDataPreferenceControllerTest.java | 4 +-- ...ackupInactivePreferenceControllerTest.java | 4 +-- .../backup/BackupSettingsActivityTest.java | 9 ++++--- .../backup/BackupSettingsHelperTest.java | 1 + ...ackupSettingsPreferenceControllerTest.java | 7 +++--- ...figureAccountPreferenceControllerTest.java | 4 +-- ...ataManagementPreferenceControllerTest.java | 4 +-- .../FaceStatusPreferenceControllerTest.java | 6 +++-- .../FingerprintEnrollEnrollingTest.java | 1 + .../FingerprintEnrollFindSensorTest.java | 1 + ...ngerprintEnrollSuggestionActivityTest.java | 1 + .../FingerprintPreferenceTest.java | 5 ++-- ...ProfileStatusPreferenceControllerTest.java | 2 ++ ...erprintStatusPreferenceControllerTest.java | 6 +++-- .../FingerprintSuggestionActivityTest.java | 1 + .../SetupFingerprintEnrollFindSensorTest.java | 5 ++-- ...etupFingerprintEnrollIntroductionTest.java | 4 ++- .../bluetooth/AlwaysDiscoverableTest.java | 1 + ...BluetoothDetailsButtonsControllerTest.java | 7 +++--- .../BluetoothDetailsControllerEventsTest.java | 6 ++--- .../BluetoothDetailsControllerTestBase.java | 10 ++++---- .../BluetoothDetailsHeaderControllerTest.java | 9 ++++--- ...luetoothDetailsProfilesControllerTest.java | 7 +++--- .../BluetoothDeviceDetailsFragmentTest.java | 1 + ...othDeviceNamePreferenceControllerTest.java | 10 ++++---- .../BluetoothDevicePreferenceTest.java | 1 + ...hDeviceRenamePreferenceControllerTest.java | 12 +++++---- .../bluetooth/BluetoothDeviceUpdaterTest.java | 2 ++ .../bluetooth/BluetoothEnablerTest.java | 5 ++-- ...luetoothFilesPreferenceControllerTest.java | 5 ++-- .../BluetoothPairingControllerTest.java | 1 + .../bluetooth/BluetoothPairingDetailTest.java | 5 ++-- .../bluetooth/BluetoothPairingDialogTest.java | 5 ++-- ...etoothPairingPreferenceControllerTest.java | 5 ++-- .../bluetooth/BluetoothSliceBuilderTest.java | 17 +++++++------ .../BluetoothSummaryUpdaterTest.java | 1 + ...uetoothSwitchPreferenceControllerTest.java | 3 +-- .../ConnectedBluetoothDeviceUpdaterTest.java | 1 + .../DeviceListPreferenceFragmentTest.java | 5 ++-- .../ForgetDeviceDialogFragmentTest.java | 7 +++--- .../LocalDeviceNameDialogFragmentTest.java | 5 ++-- .../AddDevicePreferenceControllerTest.java | 7 ++++-- ...AdvancedConnectedDeviceControllerTest.java | 2 ++ .../ConnectedDeviceDashboardFragmentTest.java | 2 ++ ...verableFooterPreferenceControllerTest.java | 5 ++-- ...nnectedDevicePreferenceControllerTest.java | 6 +++-- .../SavedDeviceGroupControllerTest.java | 8 +++--- .../usb/ConnectedUsbDeviceUpdaterTest.java | 1 + .../connecteddevice/usb/UsbBackendTest.java | 1 + .../UsbConnectionBroadcastReceiverTest.java | 1 + .../usb/UsbDefaultFragmentTest.java | 1 + .../usb/UsbDetailsDataRoleControllerTest.java | 11 ++++---- .../UsbDetailsFunctionsControllerTest.java | 11 ++++---- .../usb/UsbDetailsHeaderControllerTest.java | 10 ++++---- .../UsbDetailsPowerRoleControllerTest.java | 13 +++++----- .../core/BasePreferenceControllerTest.java | 8 +++--- .../InstrumentedPreferenceFragmentTest.java | 8 +++--- .../core/SliderPreferenceControllerTest.java | 4 +-- .../settings/core/SubSettingLauncherTest.java | 7 +++--- .../core/TogglePreferenceControllerTest.java | 4 +-- .../InstrumentableFragmentCodeInspector.java | 4 +-- ...dFragmentSearchIndexProviderInspector.java | 4 +-- .../dashboard/DashboardSummaryTest.java | 7 +++--- ...lePlaceholderPreferenceControllerTest.java | 7 +++--- .../suggestions/SuggestionAdapterTest.java | 1 + .../SuggestionStateProviderTest.java | 1 + .../datausage/AppDataUsagePreferenceTest.java | 1 + .../settings/datausage/AppDataUsageTest.java | 6 ++--- .../settings/datausage/AppPrefLoaderTest.java | 5 ++-- .../datausage/BillingCycleSettingsTest.java | 10 +++++--- .../datausage/CellDataPreferenceTest.java | 5 ++-- .../ChartDataUsagePreferenceTest.java | 1 + .../settings/datausage/DataUsageListTest.java | 5 ++-- ...aUsageSummaryPreferenceControllerTest.java | 9 ++++--- .../DataUsageSummaryPreferenceTest.java | 8 +++--- .../datausage/DataUsageSummaryTest.java | 5 ++-- .../datausage/DataUsageUtilsTest.java | 1 + ...tedDataAccessPreferenceControllerTest.java | 7 +++--- ...utoTimeFormatPreferenceControllerTest.java | 4 +-- .../AutoTimePreferenceControllerTest.java | 1 + .../AutoTimeZonePreferenceControllerTest.java | 5 ++-- .../DatePreferenceControllerTest.java | 1 + .../datetime/TimeChangeListenerMixinTest.java | 1 + .../TimeFormatPreferenceControllerTest.java | 7 +++--- .../TimePreferenceControllerTest.java | 1 + .../TimeZonePreferenceControllerTest.java | 1 + .../timezone/BaseTimeZoneAdapterTest.java | 4 +-- .../BaseTimeZonePreferenceControllerTest.java | 4 +-- .../timezone/FixedOffsetPickerTest.java | 1 + .../FixedOffsetPreferenceControllerTest.java | 4 +-- .../RegionPreferenceControllerTest.java | 4 +-- .../timezone/RegionSearchPickerTest.java | 7 +++--- .../RegionZonePreferenceControllerTest.java | 4 +-- .../TimeZoneInfoPreferenceControllerTest.java | 4 +-- .../timezone/TimeZoneSettingsTest.java | 1 + .../timezone/model/TimeZoneDataTest.java | 1 + ...erDescriptionPreferenceControllerTest.java | 6 ++--- ...StorageManagerSwitchBarControllerTest.java | 9 ++++--- ...BluetoothA2dpPreferenceControllerTest.java | 9 ++++--- .../AdbPreferenceControllerTest.java | 7 +++--- ...ppsOnExternalPreferenceControllerTest.java | 8 +++--- ...DurationScalePreferenceControllerTest.java | 7 +++--- ...NotRespondingPreferenceControllerTest.java | 8 +++--- ...dProcessLimitPreferenceControllerTest.java | 6 ++--- ...A2dpHwOffloadPreferenceControllerTest.java | 8 +++--- ...bsoluteVolumePreferenceControllerTest.java | 8 +++--- ...BitsPerSamplePreferenceControllerTest.java | 9 ++++--- ...ioChannelModePreferenceControllerTest.java | 9 ++++--- ...othAudioCodecPreferenceControllerTest.java | 9 ++++--- ...hAudioQualityPreferenceControllerTest.java | 9 ++++--- ...dioSampleRatePreferenceControllerTest.java | 9 ++++--- ...hAvrcpVersionPreferenceControllerTest.java | 8 +++--- ...hDeviceNoNamePreferenceControllerTest.java | 8 +++--- ...dAudioDevicesPreferenceControllerTest.java | 8 +++--- ...toothSnoopLogPreferenceControllerTest.java | 8 +++--- ...ReportInPowerPreferenceControllerTest.java | 8 +++--- .../BugReportPreferenceControllerTest.java | 1 + ...raLaserSensorPreferenceControllerTest.java | 8 +++--- .../ClearAdbKeysPreferenceControllerTest.java | 10 +++++--- ...orTemperaturePreferenceControllerTest.java | 8 +++--- ...ugGpuOverdrawPreferenceControllerTest.java | 7 +++--- ...lipOperationsPreferenceControllerTest.java | 7 +++--- ...iewAttributesPreferenceControllerTest.java | 7 +++--- ...elopmentSettingsDashboardFragmentTest.java | 1 + .../DevelopmentSwitchBarControllerTest.java | 6 +++-- ...omaticUpdatesPreferenceControllerTest.java | 7 +++--- ...DisplayCutoutPreferenceControllerTest.java | 7 +++--- ...sFullTrackingPreferenceControllerTest.java | 8 +++--- ...puDebugLayersPreferenceControllerTest.java | 8 +++--- ...ileEncryptionPreferenceControllerTest.java | 8 +++--- .../ForceMSAAPreferenceControllerTest.java | 7 +++--- ...eeformWindowsPreferenceControllerTest.java | 8 +++--- ...puViewUpdatesPreferenceControllerTest.java | 7 +++--- ...LayersUpdatesPreferenceControllerTest.java | 7 +++--- ...dwareOverlaysPreferenceControllerTest.java | 7 +++--- .../HdcpCheckingPreferenceControllerTest.java | 8 +++--- ...HighFrequencyPreferenceControllerTest.java | 14 +++-------- ...eepActivitiesPreferenceControllerTest.java | 7 +++--- ...ackupPasswordPreferenceControllerTest.java | 6 ++--- ...LocalTerminalPreferenceControllerTest.java | 7 +++--- .../LogPersistPreferenceControllerTest.java | 8 +++--- .../LogdSizePreferenceControllerTest.java | 6 ++--- .../MemoryUsagePreferenceControllerTest.java | 6 ++--- ...eDataAlwaysOnPreferenceControllerTest.java | 7 +++--- ...ckLocationAppPreferenceControllerTest.java | 8 +++--- ...annelWarningsPreferenceControllerTest.java | 7 +++--- .../OemUnlockPreferenceControllerTest.java | 8 +++--- ...tureColorModePreferenceControllerTest.java | 8 +++--- ...interLocationPreferenceControllerTest.java | 7 +++--- ...eGpuRenderingPreferenceControllerTest.java | 7 +++--- ...zableActivityPreferenceControllerTest.java | 7 +++--- .../RtlLayoutPreferenceControllerTest.java | 7 +++--- ...ondaryDisplayPreferenceControllerTest.java | 7 +++--- ...electDebugAppPreferenceControllerTest.java | 8 +++--- ...gerThrottlingPreferenceControllerTest.java | 7 +++--- ...stCrashDialogPreferenceControllerTest.java | 8 +++--- ...wLayoutBoundsPreferenceControllerTest.java | 7 +++--- ...urfaceUpdatesPreferenceControllerTest.java | 7 +++--- .../ShowTapsPreferenceControllerTest.java | 7 +++--- ...ateColorSpacePreferenceControllerTest.java | 8 +++--- .../StayAwakePreferenceControllerTest.java | 5 ++-- .../StrictModePreferenceControllerTest.java | 7 +++--- ...HardwareAccelPreferenceControllerTest.java | 7 +++--- ...nimationScalePreferenceControllerTest.java | 7 +++--- ...bAudioRoutingPreferenceControllerTest.java | 7 +++--- ...fyAppsOverUsbPreferenceControllerTest.java | 5 ++-- ...itForDebuggerPreferenceControllerTest.java | 8 +++--- .../WebViewAppPreferenceControllerTest.java | 6 ++--- ...RandomizationPreferenceControllerTest.java | 8 +++--- ...CertificationPreferenceControllerTest.java | 7 +++--- ...erboseLoggingPreferenceControllerTest.java | 6 ++--- ...nimationScalePreferenceControllerTest.java | 7 +++--- ...lLoggingLevelPreferenceControllerTest.java | 10 ++++---- ...lResetOptionsPreferenceControllerTest.java | 9 +++---- .../FeatureFlagPreferenceControllerTest.java | 8 +++--- ...velopmentTilePreferenceControllerTest.java | 9 ++++--- .../qstile/DevelopmentTilesTest.java | 1 + .../development/qstile/WinscopeTraceTest.java | 2 ++ ...randedAccountPreferenceControllerTest.java | 1 + .../BuildNumberPreferenceControllerTest.java | 11 ++++---- .../DeviceModelPreferenceControllerTest.java | 15 +++++------ .../DeviceNamePreferenceControllerTest.java | 6 +++-- ...ccEquipmentIdPreferenceControllerTest.java | 7 +++--- .../FeedbackPreferenceControllerTest.java | 9 ++++--- .../HardwareInfoDialogFragmentTest.java | 4 +-- .../ManualPreferenceControllerTest.java | 1 + .../deviceinfo/MyDeviceInfoFragmentTest.java | 7 +++--- .../PhoneNumberPreferenceControllerTest.java | 7 +++--- .../deviceinfo/PrivateVolumeForgetTest.java | 6 ++--- ...PrivateVolumeOptionMenuControllerTest.java | 1 + ...egulatoryInfoPreferenceControllerTest.java | 7 +++--- .../StorageDashboardFragmentTest.java | 5 ++-- .../deviceinfo/StorageItemPreferenceTest.java | 5 ++-- .../StorageProfileFragmentTest.java | 1 + .../BasebandVersionDialogControllerTest.java | 10 +++++--- .../BuildNumberDialogControllerTest.java | 4 ++- .../FirmwareVersionDialogControllerTest.java | 7 ++++-- ...rmwareVersionPreferenceControllerTest.java | 10 ++++---- .../KernelVersionDialogControllerTest.java | 4 ++- ...ecurityPatchLevelDialogControllerTest.java | 7 ++++-- .../imei/ImeiInfoDialogControllerTest.java | 1 + .../ImeiInfoPreferenceControllerTest.java | 11 ++++---- .../CopyrightPreferenceControllerTest.java | 7 +++--- .../LicensePreferenceControllerTest.java | 7 +++--- .../legal/TermsPreferenceControllerTest.java | 7 +++--- ...ebViewLicensePreferenceControllerTest.java | 7 +++--- .../SimStatusDialogControllerTest.java | 5 ++-- .../SimStatusPreferenceControllerTest.java | 10 ++++---- ...agementSwitchPreferenceControllerTest.java | 11 ++++---- .../CachedStorageValuesHelperTest.java | 17 +++++++++---- .../storage/SecondaryUserControllerTest.java | 10 +++++--- .../StorageItemPreferenceControllerTest.java | 14 ++++++----- ...eSummaryDonutPreferenceControllerTest.java | 6 +++-- .../storage/UserProfileControllerTest.java | 8 +++--- .../storage/VolumeSizesLoaderTest.java | 1 + ...splayAlwaysOnPreferenceControllerTest.java | 1 + ...NotificationsPreferenceControllerTest.java | 6 +++-- .../settings/display/AppGridViewTest.java | 1 + ...utoBrightnessPreferenceControllerTest.java | 1 + .../AutoRotatePreferenceControllerTest.java | 5 ++-- ...eryPercentagePreferenceControllerTest.java | 1 + ...ightnessLevelPreferenceControllerTest.java | 8 +++--- .../ColorModePreferenceControllerTest.java | 5 ++-- .../ColorModePreferenceFragmentTest.java | 9 ++++--- .../DarkUIPreferenceControllerTest.java | 6 ++--- ...layActivationPreferenceControllerTest.java | 5 ++-- ...wOperatorNamePreferenceControllerTest.java | 5 ++-- .../ThemePreferenceControllerTest.java | 5 ++-- .../display/TimeoutListPreferenceTest.java | 1 + .../TimeoutPreferenceControllerTest.java | 2 ++ .../VrDisplayPreferencePickerTest.java | 1 + .../WallpaperPreferenceControllerTest.java | 1 + .../dream/CurrentDreamPickerTest.java | 1 + .../CurrentDreamPreferenceControllerTest.java | 1 + .../settings/dream/DreamSettingsTest.java | 1 + .../StartNowPreferenceControllerTest.java | 5 ++-- .../settings/dream/WhenToDreamPickerTest.java | 1 + .../WhenToDreamPreferenceControllerTest.java | 4 +-- ...minActionPreferenceControllerTestBase.java | 5 ++-- ...rmissionsPreferenceControllerTestBase.java | 5 ++-- ...pnCurrentUserPreferenceControllerTest.java | 5 ++-- ...anagedProfilePreferenceControllerTest.java | 5 ++-- .../ApplicationListFragmentTest.java | 8 +++--- ...plicationListPreferenceControllerTest.java | 8 +++--- ...ackupsEnabledPreferenceControllerTest.java | 5 ++-- .../BugReportsPreferenceControllerTest.java | 1 + ...tsCurrentUserPreferenceControllerTest.java | 5 ++-- .../CaCertsPreferenceControllerTestBase.java | 5 ++-- ...alledPackagesPreferenceControllerTest.java | 5 ++-- ...erprisePrivacyFeatureProviderImplTest.java | 1 + ...rprisePrivacyPreferenceControllerTest.java | 5 ++-- .../EnterprisePrivacySettingsTest.java | 1 + ...erpriseSetDefaultAppsListFragmentTest.java | 7 +++--- ...faultAppsListPreferenceControllerTest.java | 9 ++++--- ...etDefaultAppsPreferenceControllerTest.java | 5 ++-- ...swordWipePreferenceControllerTestBase.java | 5 ++-- ...obalHttpProxyPreferenceControllerTest.java | 5 ++-- .../ImePreferenceControllerTest.java | 5 ++-- ...geDeviceAdminPreferenceControllerTest.java | 5 ++-- .../NetworkLogsPreferenceControllerTest.java | 1 + .../SecurityLogsPreferenceControllerTest.java | 1 + .../FlashlightSliceBuilderTest.java | 15 +++++------ .../AdvancedPowerUsageDetailTest.java | 12 +++++---- ...toRestrictionPreferenceControllerTest.java | 4 +-- ...atteryAppListPreferenceControllerTest.java | 4 +-- .../BatteryBroadcastReceiverTest.java | 2 ++ ...BatteryHeaderPreferenceControllerTest.java | 12 +++++---- .../BatteryHistoryPreferenceTest.java | 5 ++-- .../fuelgauge/BatteryInfoLoaderTest.java | 1 + .../settings/fuelgauge/BatteryInfoTest.java | 1 + .../fuelgauge/BatteryMeterViewTest.java | 1 + ...yOptimizationPreferenceControllerTest.java | 6 ++--- .../fuelgauge/BatterySaverControllerTest.java | 6 ++--- .../settings/fuelgauge/BatteryUtilsTest.java | 2 ++ .../fuelgauge/PowerGaugePreferenceTest.java | 4 +-- .../fuelgauge/PowerUsageAdvancedTest.java | 5 ++-- .../fuelgauge/PowerUsageBaseTest.java | 4 +-- .../PowerUsageFeatureProviderImplTest.java | 1 + .../RestrictAppPreferenceControllerTest.java | 4 +-- .../fuelgauge/RestrictedAppDetailsTest.java | 11 ++++---- .../SmartBatteryPreferenceControllerTest.java | 4 +-- ...oBatterySaverPreferenceControllerTest.java | 4 +-- ...atterySeekBarPreferenceControllerTest.java | 4 +-- ...rySaverButtonPreferenceControllerTest.java | 5 ++-- .../AnomalyCleanupJobServiceTest.java | 1 + .../AnomalyConfigJobServiceTest.java | 1 + .../AnomalyDetectionJobServiceTest.java | 2 ++ ...atteryManagerPreferenceControllerTest.java | 5 ++-- .../BatteryTipDialogFragmentTest.java | 5 ++-- .../batterytip/BatteryTipLoaderTest.java | 1 + .../BatteryTipPreferenceControllerTest.java | 14 ++++++----- .../detectors/EarlyWarningDetectorTest.java | 1 + .../detectors/HighUsageDetectorTest.java | 1 + .../detectors/LowBatteryDetectorTest.java | 1 + .../detectors/RestrictAppDetectorTest.java | 1 + .../detectors/SmartBatteryDetectorTest.java | 1 + .../detectors/SummaryDetectorTest.java | 1 + .../batterytip/tips/BatteryTipTest.java | 6 ++--- .../batterytip/tips/EarlyWarningTipTest.java | 1 + .../batterytip/tips/HighUsageTipTest.java | 1 + .../batterytip/tips/LowBatteryTipTest.java | 1 + .../batterytip/tips/RestrictAppTipTest.java | 1 + .../batterytip/tips/SummaryTipTest.java | 1 + ...stureSettingsPreferenceControllerTest.java | 1 + .../gestures/AssistGestureSettingsTest.java | 1 + ...oubleTapPowerPreferenceControllerTest.java | 2 ++ ...ubleTapScreenPreferenceControllerTest.java | 2 ++ .../DoubleTwistPreferenceControllerTest.java | 1 + .../GesturePreferenceControllerTest.java | 9 ++++--- ...turesSettingsPreferenceControllerTest.java | 5 ++-- ...PickupGesturePreferenceControllerTest.java | 4 +-- ...RingingParentPreferenceControllerTest.java | 3 +++ ...reventRingingPreferenceControllerTest.java | 9 ++++--- .../ReachGesturePreferenceControllerTest.java | 3 --- ...oNotificationPreferenceControllerTest.java | 2 ++ ...rmalRingerConditionControllerBaseTest.java | 2 -- .../BatterySaverConditionControllerTest.java | 2 -- .../conditional/ConditionManagerTest.java | 4 --- .../DndConditionalCardControllerTest.java | 2 -- .../conditional/DndConditionalCardTest.java | 3 --- ...ameControllerPreferenceControllerTest.java | 2 ++ .../InputMethodAndSubtypeEnablerTest.java | 5 ++-- ...hodAndSubtypePreferenceControllerTest.java | 9 ++++--- .../KeyboardLayoutPickerControllerTest.java | 11 ++++---- ...sicalKeyboardPreferenceControllerTest.java | 5 ++-- .../SpellCheckerPreferenceControllerTest.java | 5 ++-- .../UserDictionaryListControllerTest.java | 9 ++++--- ...rtualKeyboardPreferenceControllerTest.java | 7 +++--- .../LanguageAndInputSettingsTest.java | 5 ++-- ...PhoneLanguagePreferenceControllerTest.java | 5 ++-- .../language/PointerSpeedControllerTest.java | 1 + ...serDictionaryPreferenceControllerTest.java | 4 +-- ...toothScanningPreferenceControllerTest.java | 5 ++-- .../location/LocationEnablerTest.java | 6 +++-- ...ocationFooterPreferenceControllerTest.java | 9 ++++--- ...cationForWorkPreferenceControllerTest.java | 7 +++--- .../LocationPreferenceControllerTest.java | 10 +++++--- ...cationServicePreferenceControllerTest.java | 11 ++++---- .../location/LocationSliceBuilderTest.java | 17 +++++++------ .../LocationSwitchBarControllerTest.java | 4 +-- ...cationRequestPreferenceControllerTest.java | 12 +++++---- ...RequestSeeAllPreferenceControllerTest.java | 8 +++--- .../WifiScanningPreferenceControllerTest.java | 5 ++-- .../Enhanced4gLteSliceHelperTest.java | 20 ++++++++------- .../AirplaneModePreferenceControllerTest.java | 9 ++++--- .../settings/network/ApnEditorTest.java | 13 +++++----- ...MobileNetworkPreferenceControllerTest.java | 14 +++++------ .../network/NetworkDashboardFragmentTest.java | 1 + .../NetworkResetPreferenceControllerTest.java | 1 + .../NetworkResetRestrictionCheckerTest.java | 1 + ...kScorerPickerPreferenceControllerTest.java | 5 ++-- .../network/NetworkScorerPickerTest.java | 7 +++--- .../PrivateDnsModeDialogPreferenceTest.java | 6 +++-- .../PrivateDnsPreferenceControllerTest.java | 14 +++++++---- .../TetherPreferenceControllerTest.java | 4 +-- .../network/VpnPreferenceControllerTest.java | 10 +++++--- .../AndroidBeamPreferenceControllerTest.java | 5 ++-- .../nfc/NfcAirplaneModeObserverTest.java | 4 +-- .../android/settings/nfc/NfcEnablerTest.java | 5 ++-- ...NfcForegroundPreferenceControllerTest.java | 7 +++--- .../NfcPaymentPreferenceControllerTest.java | 5 ++-- .../nfc/NfcPreferenceControllerTest.java | 7 +++--- .../settings/nfc/PaymentSettingsTest.java | 1 + ...umeRestrictedPreferenceControllerTest.java | 5 ++-- .../AlarmVolumePreferenceControllerTest.java | 1 + .../AllowSoundPreferenceControllerTest.java | 8 +++--- .../AppLinkPreferenceControllerTest.java | 6 +++-- .../BadgePreferenceControllerTest.java | 8 +++--- ...gNotificationPreferenceControllerTest.java | 8 +++--- .../BlockPreferenceControllerTest.java | 2 ++ .../BootSoundPreferenceControllerTest.java | 7 +++--- .../CallVolumePreferenceControllerTest.java | 2 ++ ...ChargingSoundPreferenceControllerTest.java | 8 +++--- .../ConfigureNotificationSettingsTest.java | 2 ++ ...letedChannelsPreferenceControllerTest.java | 4 +-- .../DescriptionPreferenceControllerTest.java | 6 +++-- .../DialPadTonePreferenceControllerTest.java | 9 ++++--- .../DndPreferenceControllerTest.java | 8 +++--- ...ockAudioMediaPreferenceControllerTest.java | 9 ++++--- .../DockingSoundPreferenceControllerTest.java | 9 ++++--- ...encyBroadcastPreferenceControllerTest.java | 1 + ...EmergencyTonePreferenceControllerTest.java | 9 ++++--- .../HeaderPreferenceControllerTest.java | 8 +++--- .../ImportancePreferenceControllerTest.java | 8 +++--- .../LightsPreferenceControllerTest.java | 8 +++--- .../NotificationAppPreferenceTest.java | 7 +++--- .../notification/NotificationBackendTest.java | 1 + .../NotificationPreferenceControllerTest.java | 6 +++-- ...icationVolumePreferenceControllerTest.java | 1 + ...ificationsOffPreferenceControllerTest.java | 6 +++-- ...PhoneRingtonePreferenceControllerTest.java | 1 + ...eNotificationPreferenceControllerTest.java | 8 +++--- ...NotifyingAppsPreferenceControllerTest.java | 13 +++++----- .../RedactionInterstitialTest.java | 2 ++ .../RingVolumePreferenceControllerTest.java | 1 + .../RingtonePreferenceControllerBaseTest.java | 5 ++-- ...reenLockSoundPreferenceControllerTest.java | 9 ++++--- .../SettingPrefControllerTest.java | 8 +++--- .../SoundPreferenceControllerTest.java | 8 +++--- .../notification/SoundSettingsTest.java | 1 + .../notification/SuppressorHelperTest.java | 1 + .../TouchSoundPreferenceControllerTest.java | 10 ++++---- ...ibrateOnTouchPreferenceControllerTest.java | 9 ++++--- ...brateWhenRingPreferenceControllerTest.java | 11 +++++--- .../VibrationPreferenceControllerTest.java | 8 +++--- .../VisibilityPreferenceControllerTest.java | 2 ++ ...VolumeSeekBarPreferenceControllerTest.java | 7 +++--- .../WorkSoundPreferenceControllerTest.java | 11 ++++---- .../ZenCustomRadioButtonPreferenceTest.java | 5 ++-- .../ZenFooterPreferenceControllerTest.java | 6 +++-- ...ZenModeAlarmsPreferenceControllerTest.java | 7 +++--- ...utomaticRulesPreferenceControllerTest.java | 9 ++++--- ...BehaviorCallsPreferenceControllerTest.java | 4 +-- ...ehaviorFooterPreferenceControllerTest.java | 8 +++--- ...EventReminderPreferenceControllerTest.java | 4 +-- ...BehaviorSoundPreferenceControllerTest.java | 4 +-- ...ZenModeButtonPreferenceControllerTest.java | 9 ++++--- .../ZenModeCallsPreferenceControllerTest.java | 7 +++--- ...ZenModeEventsPreferenceControllerTest.java | 7 +++--- .../ZenModeMediaPreferenceControllerTest.java | 7 +++--- ...nModeMessagesPreferenceControllerTest.java | 7 +++--- .../ZenModePreferenceControllerTest.java | 6 +++-- ...ModeRemindersPreferenceControllerTest.java | 7 +++--- ...RepeatCallersPreferenceControllerTest.java | 7 +++--- .../ZenModeScheduleRuleSettingsTest.java | 5 ++-- ...ettingsFooterPreferenceControllerTest.java | 8 +++--- .../notification/ZenModeSettingsTest.java | 1 + .../notification/ZenModeSliceBuilderTest.java | 16 ++++++------ ...arredContactsPreferenceControllerTest.java | 8 +++--- ...ZenModeSystemPreferenceControllerTest.java | 7 +++--- ...ModeVisEffectPreferenceControllerTest.java | 5 ++-- ...VisEffectsAllPreferenceControllerTest.java | 6 +++-- ...EffectsCustomPreferenceControllerTest.java | 6 +++-- ...isEffectsNonePreferenceControllerTest.java | 6 +++-- .../ZenOnboardingActivityTest.java | 3 +++ .../ChooseLockGenericControllerTest.java | 1 + .../password/ChooseLockGenericTest.java | 4 +-- .../password/ChooseLockPasswordTest.java | 1 + .../password/ChooseLockPatternTest.java | 1 + .../ChooseLockSettingsHelperTest.java | 1 + .../ChooseLockTypeDialogFragmentTest.java | 7 +++--- .../password/ConfirmCredentialTest.java | 6 ++--- .../SetNewPasswordControllerTest.java | 3 +++ .../password/SetupChooseLockPasswordTest.java | 5 ++-- .../password/SetupChooseLockPatternTest.java | 7 +++--- .../password/SetupSkipDialogTest.java | 6 ++--- ...PrintSettingsPreferenceControllerTest.java | 6 +++-- .../search/BaseSearchIndexProviderTest.java | 1 + .../DeviceIndexUpdateJobServiceTest.java | 8 +++--- .../search/SearchFeatureProviderImplTest.java | 1 + .../search/SearchIndexableResourcesTest.java | 3 +++ .../actionbar/SearchMenuControllerTest.java | 2 +- ...entialStoragePreferenceControllerTest.java | 4 +-- .../security/EncryptionAndCredentialTest.java | 2 ++ ...ryptionStatusPreferenceControllerTest.java | 5 ++-- ...ckUnificationPreferenceControllerTest.java | 6 ++--- ...ockdownButtonPreferenceControllerTest.java | 5 ++-- .../OwnerInfoPreferenceControllerTest.java | 13 +++++----- ...tedEncryptionPreferenceControllerTest.java | 4 +-- ...ScreenPinningPreferenceControllerTest.java | 4 +-- .../ShowPasswordPreferenceControllerTest.java | 7 +++--- .../SimLockPreferenceControllerTest.java | 8 +++--- ...atternProfilePreferenceControllerTest.java | 7 ++++-- ...kAfterTimeoutPreferenceControllerTest.java | 2 ++ .../LockScreenPreferenceControllerTest.java | 12 ++++++--- ...atternVisiblePreferenceControllerTest.java | 5 ++-- ...onInstantLockPreferenceControllerTest.java | 5 ++-- .../screenlock/ScreenLockSettingsTest.java | 1 + ...geTrustAgentsPreferenceControllerTest.java | 5 ++-- ...rustAgentListPreferenceControllerTest.java | 12 +++++---- .../trustagent/TrustAgentManagerTest.java | 1 + .../TrustAgentsPreferenceControllerTest.java | 6 ++--- ...reateShortcutPreferenceControllerTest.java | 2 ++ .../shortcut/ShortcutsUpdateTaskTest.java | 2 ++ .../slices/SettingsSliceProviderTest.java | 12 +++++---- .../slices/SliceBuilderUtilsTest.java | 15 +++++------ .../SliceControllerInXmlCodeInspector.java | 1 + .../slices/SliceDataConverterTest.java | 1 + .../slices/SliceRelayReceiverTest.java | 3 ++- .../slices/SlicesDatabaseAccessorTest.java | 1 + .../slices/SlicesDatabaseHelperTest.java | 1 + .../settings/slices/SlicesIndexerTest.java | 1 + .../slices/SpecialCaseSliceManagerTest.java | 4 +-- ...oOutputSwitchPreferenceControllerTest.java | 11 +++++--- ...ProfileOutputPreferenceControllerTest.java | 10 +++++--- .../MediaOutputPreferenceControllerTest.java | 10 +++++--- .../settings/survey/SurveyMixinTest.java | 7 +++--- .../SystemUpdatePreferenceControllerTest.java | 8 +++--- .../testutils/FragmentController.java | 6 ++--- .../settings/testutils/ResIdSubject.java | 5 ++-- .../settings/testutils/Robolectric.java | 6 ++--- .../settings/testutils/SliceTester.java | 19 +++++++------- .../shadow/SettingsShadowResources.java | 9 ++++--- .../shadow/ShadowActivityWithLoadManager.java | 4 +-- .../shadow/ShadowAlertDialogCompat.java | 4 +-- .../testutils/shadow/ShadowAudioManager.java | 1 + .../testutils/shadow/ShadowBidiFormatter.java | 4 +-- .../shadow/ShadowBluetoothDevice.java | 1 + .../testutils/shadow/ShadowCardView.java | 4 +-- .../shadow/ShadowEntityHeaderController.java | 4 +-- .../shadow/ShadowFingerprintManager.java | 4 +-- .../testutils/shadow/ShadowFragment.java | 6 ++--- .../shadow/ShadowPermissionChecker.java | 6 ++--- ...serWhenLockedPreferenceControllerTest.java | 5 ++-- .../AutoSyncDataPreferenceControllerTest.java | 11 ++++---- ...cPersonalDataPreferenceControllerTest.java | 9 ++++--- ...oSyncWorkDataPreferenceControllerTest.java | 5 ++-- .../users/EditUserInfoControllerTest.java | 8 +++--- ...ltiUserFooterPreferenceControllerTest.java | 1 + .../users/UserFeatureProviderImplTest.java | 1 + .../settings/users/UserPreferenceTest.java | 1 + .../settings/users/UserSettingsTest.java | 15 +++++------ .../settings/vpn2/AppDialogFragmentTest.java | 4 +-- .../android/settings/vpn2/VpnUtilsTest.java | 1 + .../wallpaper/FallbackHomeActivityTest.java | 2 -- ...WallpaperTypePreferenceControllerTest.java | 4 +-- .../webview/WebViewAppPickerTest.java | 6 +++-- .../settings/wfd/WifiDisplaySettingsTest.java | 1 + .../widget/ActionBarShadowControllerTest.java | 8 +++--- .../widget/ActionButtonPreferenceTest.java | 5 ++-- .../widget/AppCheckBoxPreferenceTest.java | 4 +-- .../settings/widget/AppPreferenceTest.java | 4 +-- .../widget/AppSwitchPreferenceTest.java | 4 +-- .../DisabledCheckBoxPreferenceTest.java | 9 ++++--- .../widget/EntityHeaderControllerTest.java | 9 ++++--- .../FixedLineSummaryPreferenceTest.java | 4 +-- ...ghlightablePreferenceGroupAdapterTest.java | 11 ++++---- .../widget/LoadingViewControllerTest.java | 1 + .../widget/MasterCheckBoxPreferenceTest.java | 7 +++--- .../widget/MasterSwitchPreferenceTest.java | 7 +++--- .../PreferenceCategoryControllerTest.java | 1 + .../widget/RadioButtonPickerFragmentTest.java | 5 ++-- .../widget/RadioButtonPreferenceTest.java | 6 +++-- .../widget/RtlCompatibleViewPagerTest.java | 4 +-- .../widget/ScrollToParentEditTextTest.java | 1 + .../settings/widget/SwitchBarTest.java | 1 + .../widget/TwoStateButtonPreferenceTest.java | 1 + ...tableListPreferenceDialogFragmentTest.java | 5 ++-- .../ValidatedEditTextPreferenceTest.java | 5 ++-- .../widget/VideoPreferenceControllerTest.java | 5 ++-- .../settings/widget/VideoPreferenceTest.java | 5 ++-- .../AppStateChangeWifiStateBridgeTest.java | 1 + ...lularFallbackPreferenceControllerTest.java | 1 + .../wifi/ChangeWifiStateDetailsTest.java | 1 + .../wifi/ConfigureWifiSettingsTest.java | 1 + .../ConnectedAccessPointPreferenceTest.java | 1 + .../settings/wifi/LinkablePreferenceTest.java | 4 +-- ...fyOpenNetworkPreferenceControllerTest.java | 8 +++--- .../UseOpenWifiPreferenceControllerTest.java | 11 +++++--- .../wifi/WifiConfigControllerTest.java | 1 + .../settings/wifi/WifiDialogActivityTest.java | 1 + .../settings/wifi/WifiEnablerTest.java | 1 + .../WifiInfoPreferenceControllerTest.java | 10 +++++--- ...iMasterSwitchPreferenceControllerTest.java | 7 +++--- .../WifiScanningRequiredFragmentTest.java | 7 +++--- .../settings/wifi/WifiSettingsTest.java | 1 - .../android/settings/wifi/WifiSliceTest.java | 17 +++++++------ .../settings/wifi/WifiSummaryUpdaterTest.java | 1 + .../WifiWakeupPreferenceControllerTest.java | 8 +++--- .../wifi/WriteWifiConfigToNfcDialogTest.java | 1 + .../calling/WifiCallingSliceHelperTest.java | 25 ++++++++++--------- .../WifiDetailPreferenceControllerTest.java | 11 ++++---- .../WifiMeteredPreferenceControllerTest.java | 5 ++-- .../P2pCategoryPreferenceControllerTest.java | 9 ++++--- ...P2pThisDevicePreferenceControllerTest.java | 7 +++--- .../p2p/WifiP2PPreferenceControllerTest.java | 10 +++++--- .../wifi/tether/TetherServiceTest.java | 1 + ...iTetherApBandPreferenceControllerTest.java | 7 +++--- ...TetherAutoOffPreferenceControllerTest.java | 4 +-- ...etherPasswordPreferenceControllerTest.java | 5 ++-- .../WifiTetherPreferenceControllerTest.java | 7 +++--- ...ifiTetherSSIDPreferenceControllerTest.java | 5 ++-- ...etherSecurityPreferenceControllerTest.java | 7 +++--- .../WifiTetherSwitchBarControllerTest.java | 1 + 1483 files changed, 4655 insertions(+), 3953 deletions(-) diff --git a/src/com/android/settings/AllowBindAppWidgetActivity.java b/src/com/android/settings/AllowBindAppWidgetActivity.java index 7557d975b14..1cfeb497bea 100644 --- a/src/com/android/settings/AllowBindAppWidgetActivity.java +++ b/src/com/android/settings/AllowBindAppWidgetActivity.java @@ -29,11 +29,11 @@ import android.util.Log; import android.view.LayoutInflater; import android.widget.CheckBox; +import androidx.appcompat.app.AlertDialog; + import com.android.internal.app.AlertActivity; import com.android.internal.app.AlertController; -import androidx.appcompat.app.AlertDialog; - /** * This activity is displayed when an app launches the BIND_APPWIDGET intent. This allows apps * that don't have the BIND_APPWIDGET permission to bind specific widgets. diff --git a/src/com/android/settings/BandMode.java b/src/com/android/settings/BandMode.java index 9728a5f8ebb..5be82f6d06c 100644 --- a/src/com/android/settings/BandMode.java +++ b/src/com/android/settings/BandMode.java @@ -14,11 +14,11 @@ import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.ListView; +import androidx.appcompat.app.AlertDialog; + import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneFactory; -import androidx.appcompat.app.AlertDialog; - /** * Radio Band Mode Selection Class * diff --git a/src/com/android/settings/BugreportPreference.java b/src/com/android/settings/BugreportPreference.java index d2b5ec1df1d..1da985cfc0b 100644 --- a/src/com/android/settings/BugreportPreference.java +++ b/src/com/android/settings/BugreportPreference.java @@ -26,12 +26,12 @@ import android.view.View; import android.widget.CheckedTextView; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog.Builder; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.CustomDialogPreferenceCompat; -import androidx.appcompat.app.AlertDialog.Builder; - public class BugreportPreference extends CustomDialogPreferenceCompat { private static final String TAG = "BugreportPreference"; diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java index 03a9203040f..c553e34a5b7 100644 --- a/src/com/android/settings/CredentialStorage.java +++ b/src/com/android/settings/CredentialStorage.java @@ -38,6 +38,9 @@ import android.text.TextUtils; import android.util.Log; import android.widget.Toast; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.FragmentActivity; + import com.android.internal.widget.LockPatternUtils; import com.android.org.bouncycastle.asn1.ASN1InputStream; import com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo; @@ -48,8 +51,6 @@ import com.android.settings.vpn2.VpnUtils; import java.io.ByteArrayInputStream; import java.io.IOException; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.FragmentActivity; import sun.security.util.ObjectIdentifier; import sun.security.x509.AlgorithmId; diff --git a/src/com/android/settings/CustomListPreference.java b/src/com/android/settings/CustomListPreference.java index 6ac7a56d938..734cac23fcd 100644 --- a/src/com/android/settings/CustomListPreference.java +++ b/src/com/android/settings/CustomListPreference.java @@ -24,15 +24,15 @@ import android.content.Intent; import android.os.Bundle; import android.util.AttributeSet; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.core.instrumentation.InstrumentedDialogFragment; - import androidx.appcompat.app.AlertDialog.Builder; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; import androidx.preference.ListPreference; import androidx.preference.ListPreferenceDialogFragmentCompat; +import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.core.instrumentation.InstrumentedDialogFragment; + public class CustomListPreference extends ListPreference { public CustomListPreference(Context context, AttributeSet attrs) { diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java index f710852b3dd..caef9888a45 100644 --- a/src/com/android/settings/EncryptionInterstitial.java +++ b/src/com/android/settings/EncryptionInterstitial.java @@ -33,6 +33,8 @@ import android.view.accessibility.AccessibilityManager; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -41,8 +43,6 @@ import com.android.setupwizardlib.GlifLayout; import java.util.List; -import androidx.appcompat.app.AlertDialog; - public class EncryptionInterstitial extends SettingsActivity { private static final String TAG = EncryptionInterstitial.class.getSimpleName(); diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java index c161d9dc9bf..437f42e424a 100644 --- a/src/com/android/settings/IccLockSettings.java +++ b/src/com/android/settings/IccLockSettings.java @@ -42,14 +42,14 @@ import android.widget.TabHost.TabSpec; import android.widget.TabWidget; import android.widget.Toast; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneFactory; import com.android.internal.telephony.TelephonyIntents; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - /** * Implements the preference screen to enable/disable ICC lock and * also the dialogs to change the ICC PIN. In the former case, enabling/disabling diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java index 2983dba7fca..6c084aba67d 100644 --- a/src/com/android/settings/MasterClear.java +++ b/src/com/android/settings/MasterClear.java @@ -53,6 +53,8 @@ import android.widget.LinearLayout; import android.widget.ScrollView; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.SubSettingLauncher; @@ -63,8 +65,6 @@ import com.android.settingslib.RestrictedLockUtils; import java.util.List; -import androidx.annotation.VisibleForTesting; - /** * Confirm and execute a reset of the device to a clean "just out of the box" * state. Multiple confirmations are required: first, a general "are you sure diff --git a/src/com/android/settings/MonitoringCertInfoActivity.java b/src/com/android/settings/MonitoringCertInfoActivity.java index d181f7ade9e..6785b4be541 100644 --- a/src/com/android/settings/MonitoringCertInfoActivity.java +++ b/src/com/android/settings/MonitoringCertInfoActivity.java @@ -26,10 +26,10 @@ import android.os.Bundle; import android.os.UserHandle; import android.provider.Settings; -import com.android.settingslib.RestrictedLockUtils; - import androidx.appcompat.app.AlertDialog; +import com.android.settingslib.RestrictedLockUtils; + /** * Activity that shows a dialog explaining that a CA cert is allowing someone to monitor network * traffic. This activity should be launched for the user into which the CA cert is installed diff --git a/src/com/android/settings/PreviewSeekBarPreferenceFragment.java b/src/com/android/settings/PreviewSeekBarPreferenceFragment.java index d9532296cef..164648fdde1 100644 --- a/src/com/android/settings/PreviewSeekBarPreferenceFragment.java +++ b/src/com/android/settings/PreviewSeekBarPreferenceFragment.java @@ -28,12 +28,12 @@ import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.TextView; -import com.android.settings.widget.DotsPageIndicator; -import com.android.settings.widget.LabeledSeekBar; - import androidx.viewpager.widget.ViewPager; import androidx.viewpager.widget.ViewPager.OnPageChangeListener; +import com.android.settings.widget.DotsPageIndicator; +import com.android.settings.widget.LabeledSeekBar; + /** * Preference fragment shows a preview and a seek bar to adjust a specific settings. */ diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java index a681b94ae90..774e47c6e80 100644 --- a/src/com/android/settings/ProxySelector.java +++ b/src/com/android/settings/ProxySelector.java @@ -38,12 +38,12 @@ import android.widget.Button; import android.widget.EditText; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment; import com.android.settings.core.InstrumentedFragment; -import androidx.appcompat.app.AlertDialog; - public class ProxySelector extends InstrumentedFragment implements DialogCreatable { private static final String TAG = "ProxySelector"; diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java index 3db99359d61..b47ecd720a5 100644 --- a/src/com/android/settings/RadioInfo.java +++ b/src/com/android/settings/RadioInfo.java @@ -79,6 +79,8 @@ import android.widget.Spinner; import android.widget.Switch; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; + import com.android.ims.ImsConfig; import com.android.ims.ImsException; import com.android.ims.ImsManager; @@ -90,8 +92,6 @@ import java.net.HttpURLConnection; import java.net.URL; import java.util.List; -import androidx.appcompat.app.AlertDialog; - public class RadioInfo extends Activity { private static final String TAG = "RadioInfo"; diff --git a/src/com/android/settings/RegulatoryInfoDisplayActivity.java b/src/com/android/settings/RegulatoryInfoDisplayActivity.java index 6430a135699..8bc1cefec5d 100644 --- a/src/com/android/settings/RegulatoryInfoDisplayActivity.java +++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.java @@ -30,11 +30,11 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import java.util.Locale; - import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; +import java.util.Locale; + /** * {@link Activity} that displays regulatory information for the "Regulatory information" * preference item, and when "*#07#" is dialed on the Phone keypad. To enable this feature, diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java index 88a704962a0..e3bd8f18219 100644 --- a/src/com/android/settings/ResetNetworkConfirm.java +++ b/src/com/android/settings/ResetNetworkConfirm.java @@ -40,6 +40,9 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; + import com.android.ims.ImsManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; @@ -48,9 +51,6 @@ import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settings.network.ApnSettings; import com.android.settingslib.RestrictedLockUtils; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; - /** * Confirm and execute a reset of the network settings to a clean "just out of the box" * state. Multiple confirmations are required: first, a general "are you sure diff --git a/src/com/android/settings/RestrictedListPreference.java b/src/com/android/settings/RestrictedListPreference.java index e79f03ef454..2e9ec14d874 100644 --- a/src/com/android/settings/RestrictedListPreference.java +++ b/src/com/android/settings/RestrictedListPreference.java @@ -34,17 +34,17 @@ import android.widget.ImageView; import android.widget.ListAdapter; import android.widget.ListView; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AlertDialog.Builder; +import androidx.preference.ListPreferenceDialogFragmentCompat; +import androidx.preference.PreferenceViewHolder; + import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreferenceHelper; import java.util.ArrayList; import java.util.List; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AlertDialog.Builder; -import androidx.preference.ListPreferenceDialogFragmentCompat; -import androidx.preference.PreferenceViewHolder; - public class RestrictedListPreference extends CustomListPreference { private final RestrictedPreferenceHelper mHelper; private final List mRestrictedItems = new ArrayList<>(); diff --git a/src/com/android/settings/RestrictedSettingsFragment.java b/src/com/android/settings/RestrictedSettingsFragment.java index 28943666fd7..7fab528ca29 100644 --- a/src/com/android/settings/RestrictedSettingsFragment.java +++ b/src/com/android/settings/RestrictedSettingsFragment.java @@ -31,13 +31,13 @@ import android.os.UserManager; import android.view.View; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; + import com.android.settings.dashboard.RestrictedDashboardFragment; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settingslib.RestrictedLockUtils; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; - /** * Base class for settings screens that should be pin protected when in restricted mode or * that will display an admin support message in case an admin has disabled the options. diff --git a/src/com/android/settings/SettingsDumpService.java b/src/com/android/settings/SettingsDumpService.java index c292dab57ee..a57e9832d03 100644 --- a/src/com/android/settings/SettingsDumpService.java +++ b/src/com/android/settings/SettingsDumpService.java @@ -30,6 +30,8 @@ import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import androidx.annotation.VisibleForTesting; + import com.android.settings.applications.ProcStatsData; import com.android.settings.fuelgauge.batterytip.AnomalyConfigJobService; import com.android.settingslib.net.DataUsageController; @@ -42,8 +44,6 @@ import java.io.File; import java.io.FileDescriptor; import java.io.PrintWriter; -import androidx.annotation.VisibleForTesting; - public class SettingsDumpService extends Service { @VisibleForTesting static final String KEY_SERVICE = "service"; diff --git a/src/com/android/settings/SettingsInitialize.java b/src/com/android/settings/SettingsInitialize.java index a66207e8127..9c37df6b3dc 100644 --- a/src/com/android/settings/SettingsInitialize.java +++ b/src/com/android/settings/SettingsInitialize.java @@ -34,13 +34,13 @@ import android.os.UserHandle; import android.os.UserManager; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.Settings.CreateShortcutActivity; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; - /** * Listens to {@link Intent.ACTION_PRE_BOOT_COMPLETED} and {@link Intent.ACTION_USER_INITIALIZED} * performs setup steps for a managed profile (disables the launcher icon of the Settings app, diff --git a/src/com/android/settings/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java index c1bf9e5e7cb..2581ed91347 100644 --- a/src/com/android/settings/SettingsLicenseActivity.java +++ b/src/com/android/settings/SettingsLicenseActivity.java @@ -26,17 +26,17 @@ import android.text.TextUtils; import android.util.Log; import android.widget.Toast; -import com.android.settings.users.RestrictedProfileSettings; -import com.android.settingslib.license.LicenseHtmlLoaderCompat; - -import java.io.File; - import androidx.annotation.VisibleForTesting; import androidx.core.content.FileProvider; import androidx.fragment.app.FragmentActivity; import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; +import com.android.settings.users.RestrictedProfileSettings; +import com.android.settingslib.license.LicenseHtmlLoaderCompat; + +import java.io.File; + /** * The "dialog" that shows from "License" in the Settings app. */ diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java index 7ad18fe4738..4197e2ff3fe 100644 --- a/src/com/android/settings/SettingsPreferenceFragment.java +++ b/src/com/android/settings/SettingsPreferenceFragment.java @@ -32,6 +32,16 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import androidx.annotation.VisibleForTesting; +import androidx.annotation.XmlRes; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.applications.LayoutPreference; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -48,16 +58,6 @@ import com.android.settingslib.widget.FooterPreferenceMixinCompat; import java.util.UUID; -import androidx.annotation.VisibleForTesting; -import androidx.annotation.XmlRes; -import androidx.fragment.app.DialogFragment; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - /** * Base class for Settings fragments, with some helper functions and dialog management. */ diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java index 60ad1ed5710..27cdb691d2b 100644 --- a/src/com/android/settings/SetupWizardUtils.java +++ b/src/com/android/settings/SetupWizardUtils.java @@ -19,10 +19,10 @@ package com.android.settings; import android.content.Intent; import android.os.SystemProperties; -import com.android.setupwizardlib.util.WizardManagerHelper; - import androidx.annotation.VisibleForTesting; +import com.android.setupwizardlib.util.WizardManagerHelper; + public class SetupWizardUtils { @VisibleForTesting diff --git a/src/com/android/settings/TestingSettings.java b/src/com/android/settings/TestingSettings.java index acfe89fff06..ff58f11ede9 100644 --- a/src/com/android/settings/TestingSettings.java +++ b/src/com/android/settings/TestingSettings.java @@ -19,10 +19,10 @@ package com.android.settings; import android.os.Bundle; import android.os.UserManager; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; - import androidx.preference.PreferenceScreen; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; + public class TestingSettings extends SettingsPreferenceFragment { @Override diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java index 9515a1368cf..02f9cc5cc7d 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -36,6 +36,10 @@ import android.os.Handler; import android.os.UserManager; import android.provider.SearchIndexableResource; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.datausage.DataSaverBackend; import com.android.settings.search.BaseSearchIndexProvider; @@ -50,10 +54,6 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - /* * Displays preferences for Tethering. */ diff --git a/src/com/android/settings/TrustedCredentialsDialogBuilder.java b/src/com/android/settings/TrustedCredentialsDialogBuilder.java index 76bf8617439..6fd846d0135 100644 --- a/src/com/android/settings/TrustedCredentialsDialogBuilder.java +++ b/src/com/android/settings/TrustedCredentialsDialogBuilder.java @@ -31,6 +31,8 @@ import android.widget.Button; import android.widget.LinearLayout; import android.widget.Spinner; +import androidx.appcompat.app.AlertDialog; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.TrustedCredentialsSettings.CertHolder; import com.android.settingslib.RestrictedLockUtils; @@ -40,8 +42,6 @@ import java.util.ArrayList; import java.util.List; import java.util.function.IntConsumer; -import androidx.appcompat.app.AlertDialog; - class TrustedCredentialsDialogBuilder extends AlertDialog.Builder { public interface DelegateInterface { List getX509CertsFromCertHolder(CertHolder certHolder); diff --git a/src/com/android/settings/UserCredentialsSettings.java b/src/com/android/settings/UserCredentialsSettings.java index 06d0be67cf6..abd8641ae31 100644 --- a/src/com/android/settings/UserCredentialsSettings.java +++ b/src/com/android/settings/UserCredentialsSettings.java @@ -43,6 +43,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -56,11 +61,6 @@ import java.util.List; import java.util.SortedMap; import java.util.TreeMap; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.DialogFragment; -import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.RecyclerView; - public class UserCredentialsSettings extends SettingsPreferenceFragment implements View.OnClickListener { private static final String TAG = "UserCredentialsSettings"; diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index 9d5f96fef39..14a9e832f1b 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -87,6 +87,11 @@ import android.widget.EditText; import android.widget.ListView; import android.widget.TabWidget; +import androidx.annotation.StringRes; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + import com.android.internal.app.UnlaunchableAppActivity; import com.android.internal.util.ArrayUtils; import com.android.internal.widget.LockPatternUtils; @@ -97,11 +102,6 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; -import androidx.annotation.StringRes; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; - public final class Utils extends com.android.settingslib.Utils { private static final String TAG = "Settings"; diff --git a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java index 95e1643b3a8..26cb7774c8b 100644 --- a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java +++ b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java @@ -35,13 +35,13 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; +import androidx.appcompat.app.AlertDialog; + import com.android.settings.R; import java.util.List; import java.util.Locale; -import androidx.appcompat.app.AlertDialog; - /** * Utility class for creating the dialog that asks users for explicit permission to grant * all of the requested capabilities to an accessibility service before the service is enabled diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index 42dc7ac781e..57447034a65 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -39,6 +39,14 @@ import android.view.KeyCharacterMap; import android.view.KeyEvent; import android.view.accessibility.AccessibilityManager; +import androidx.annotation.VisibleForTesting; +import androidx.core.content.ContextCompat; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.internal.accessibility.AccessibilityShortcutController; import com.android.internal.content.PackageMonitor; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -61,14 +69,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import androidx.annotation.VisibleForTesting; -import androidx.core.content.ContextCompat; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - /** * Activity with the accessibility settings. */ diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java index e6f7a9ad366..9ee155f97b7 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java @@ -24,14 +24,14 @@ import android.os.Bundle; import android.text.TextUtils; import android.view.accessibility.AccessibilityManager; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import java.util.List; -import androidx.preference.Preference; - /** * Activity with the accessibility settings specific to Setup Wizard. */ diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java index 1b8e554dff4..9512f011d97 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java @@ -20,15 +20,15 @@ import android.os.Bundle; import android.view.Menu; import android.view.accessibility.AccessibilityEvent; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragmentCompat; + import com.android.settings.SettingsActivity; import com.android.settings.core.SubSettingLauncher; import com.android.settings.search.actionbar.SearchMenuController; import com.android.settings.support.actionbar.HelpResourceProvider; import com.android.settingslib.core.instrumentation.Instrumentable; -import androidx.preference.Preference; -import androidx.preference.PreferenceFragmentCompat; - public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivity { private static final String SAVE_KEY_TITLE = "activity_title"; diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java index 1b773bb70fc..3cd260fc4b9 100644 --- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java @@ -28,6 +28,9 @@ import android.provider.Settings; import android.view.accessibility.AccessibilityManager; import android.widget.Switch; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.internal.accessibility.AccessibilityShortcutController; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -36,9 +39,6 @@ import com.android.settings.search.Indexable; import com.android.settingslib.accessibility.AccessibilityUtils; import com.android.settingslib.search.SearchIndexable; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - /** * Settings page for accessibility shortcut */ diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java index b1e5ece8489..33cb95ec319 100644 --- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java +++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java @@ -31,6 +31,11 @@ import android.view.ViewGroup.LayoutParams; import android.view.accessibility.CaptioningManager; import android.view.accessibility.CaptioningManager.CaptionStyle; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceCategory; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.SubtitleView; import com.android.settings.R; @@ -44,11 +49,6 @@ import com.android.settingslib.accessibility.AccessibilityUtils; import java.util.Locale; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceCategory; - /** * Settings fragment containing captioning properties. */ diff --git a/src/com/android/settings/accessibility/ColorInversionPreferenceController.java b/src/com/android/settings/accessibility/ColorInversionPreferenceController.java index bd989dc6680..4e4c17b17a7 100644 --- a/src/com/android/settings/accessibility/ColorInversionPreferenceController.java +++ b/src/com/android/settings/accessibility/ColorInversionPreferenceController.java @@ -19,10 +19,10 @@ package com.android.settings.accessibility; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.TogglePreferenceController; - import androidx.annotation.VisibleForTesting; +import com.android.settings.core.TogglePreferenceController; + public class ColorInversionPreferenceController extends TogglePreferenceController { @VisibleForTesting static final int ON = 1; diff --git a/src/com/android/settings/accessibility/ColorPreference.java b/src/com/android/settings/accessibility/ColorPreference.java index 810f8099664..e360a9ebce8 100644 --- a/src/com/android/settings/accessibility/ColorPreference.java +++ b/src/com/android/settings/accessibility/ColorPreference.java @@ -26,10 +26,10 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.android.settings.R; - import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; + /** * Grid preference that allows the user to pick a color from a predefined set of * colors. Optionally shows a preview in the preference item. diff --git a/src/com/android/settings/accessibility/ListDialogPreference.java b/src/com/android/settings/accessibility/ListDialogPreference.java index 8a09512344f..7abc450f816 100644 --- a/src/com/android/settings/accessibility/ListDialogPreference.java +++ b/src/com/android/settings/accessibility/ListDialogPreference.java @@ -30,10 +30,10 @@ import android.widget.AbsListView; import android.widget.AdapterView; import android.widget.BaseAdapter; -import com.android.settingslib.CustomDialogPreferenceCompat; - import androidx.appcompat.app.AlertDialog.Builder; +import com.android.settingslib.CustomDialogPreferenceCompat; + /** * Abstract dialog preference that displays a set of values and optional titles. */ diff --git a/src/com/android/settings/accessibility/LocalePreference.java b/src/com/android/settings/accessibility/LocalePreference.java index 145af9db65c..a3723fd4eab 100644 --- a/src/com/android/settings/accessibility/LocalePreference.java +++ b/src/com/android/settings/accessibility/LocalePreference.java @@ -19,13 +19,13 @@ package com.android.settings.accessibility; import android.content.Context; import android.util.AttributeSet; +import androidx.preference.ListPreference; + import com.android.internal.app.LocalePicker; import com.android.settings.R; import java.util.List; -import androidx.preference.ListPreference; - /** * List preference that allows the user to pick a locale from the list of * supported device locales. diff --git a/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java b/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java index 9ffdf8cdea4..f613c69e1b5 100644 --- a/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java +++ b/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java @@ -18,11 +18,11 @@ import android.os.Bundle; import android.provider.Settings; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; -import androidx.preference.Preference; - public class MagnificationGesturesPreferenceController extends TogglePreferenceController { private boolean mIsFromSUW = false; diff --git a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java b/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java index a2962d4a9bc..5af5d930561 100644 --- a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java +++ b/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java @@ -18,11 +18,11 @@ import android.os.Bundle; import android.provider.Settings; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; -import androidx.preference.Preference; - public class MagnificationNavbarPreferenceController extends TogglePreferenceController { private boolean mIsFromSUW = false; diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java index 08a62697279..aa5cd59271e 100644 --- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java +++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java @@ -16,6 +16,7 @@ package com.android.settings.accessibility; import static android.content.DialogInterface.BUTTON_POSITIVE; + import static com.android.internal.accessibility.AccessibilityShortcutController .COLOR_INVERSION_COMPONENT_NAME; import static com.android.internal.accessibility.AccessibilityShortcutController @@ -38,6 +39,9 @@ import android.provider.Settings; import android.text.TextUtils; import android.view.accessibility.AccessibilityManager; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; + import com.android.internal.accessibility.AccessibilityShortcutController; import com.android.internal.accessibility.AccessibilityShortcutController .ToggleableFrameworkFeatureInfo; @@ -53,9 +57,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; - /** * Fragment for picking accessibility shortcut service */ diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java index 6738736afb8..c0df6a344da 100644 --- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java @@ -35,6 +35,8 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.accessibility.AccessibilityManager; +import androidx.appcompat.app.AlertDialog; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; @@ -45,8 +47,6 @@ import com.android.settingslib.accessibility.AccessibilityUtils; import java.util.List; -import androidx.appcompat.app.AlertDialog; - public class ToggleAccessibilityServicePreferenceFragment extends ToggleFeaturePreferenceFragment implements DialogInterface.OnClickListener { diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java index 97be2b36e40..a9c7781cf8d 100644 --- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java @@ -24,6 +24,8 @@ import android.provider.Settings; import android.view.accessibility.AccessibilityManager; import android.widget.Switch; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; @@ -35,8 +37,6 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; - /** * Fragment for preference screen for settings related to Automatically click after mouse stops * feature. diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java index bb7bb9e9d22..184c615480e 100644 --- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java @@ -23,6 +23,9 @@ import android.provider.Settings; import android.view.accessibility.AccessibilityManager; import android.widget.Switch; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; @@ -33,9 +36,6 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; -import androidx.preference.ListPreference; -import androidx.preference.Preference; - @SearchIndexable public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceFragment implements Preference.OnPreferenceChangeListener, SwitchBar.OnSwitchChangeListener { diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java index a466c2f63fa..fba5ddb3112 100644 --- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java @@ -21,15 +21,15 @@ import android.content.pm.ResolveInfo; import android.os.Bundle; import android.view.View; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.ToggleSwitch; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public abstract class ToggleFeaturePreferenceFragment extends SettingsPreferenceFragment { protected SwitchBar mSwitchBar; diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java index b69c9886731..99ed7a1494f 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java @@ -33,14 +33,14 @@ import android.widget.RelativeLayout.LayoutParams; import android.widget.Switch; import android.widget.VideoView; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.R; -import com.android.settings.widget.SwitchBar; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceViewHolder; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settings.R; +import com.android.settings.widget.SwitchBar; + public class ToggleScreenMagnificationPreferenceFragment extends ToggleFeaturePreferenceFragment implements SwitchBar.OnSwitchChangeListener { diff --git a/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java b/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java index 789e28fd654..d9b1d7935d2 100644 --- a/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java +++ b/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java @@ -24,15 +24,15 @@ import android.os.Looper; import android.os.Vibrator; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public abstract class VibrationIntensityPreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart, OnStop { diff --git a/src/com/android/settings/accessibility/VibrationPreferenceFragment.java b/src/com/android/settings/accessibility/VibrationPreferenceFragment.java index 288b5fa53ff..1101611a845 100644 --- a/src/com/android/settings/accessibility/VibrationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/VibrationPreferenceFragment.java @@ -29,6 +29,8 @@ import android.provider.Settings; import android.util.ArrayMap; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settingslib.widget.CandidateInfo; @@ -38,8 +40,6 @@ import java.util.Comparator; import java.util.List; import java.util.Map; -import androidx.annotation.VisibleForTesting; - /** * Fragment for changing vibration settings. */ diff --git a/src/com/android/settings/accounts/AccountHeaderPreferenceController.java b/src/com/android/settings/accounts/AccountHeaderPreferenceController.java index 25a902e44a5..36a70218d94 100644 --- a/src/com/android/settings/accounts/AccountHeaderPreferenceController.java +++ b/src/com/android/settings/accounts/AccountHeaderPreferenceController.java @@ -25,6 +25,9 @@ import android.content.Context; import android.os.Bundle; import android.os.UserHandle; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.PreferenceControllerMixin; @@ -35,9 +38,6 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.PreferenceScreen; - public class AccountHeaderPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnResume { diff --git a/src/com/android/settings/accounts/AccountPreference.java b/src/com/android/settings/accounts/AccountPreference.java index 950b9874894..eea31131256 100644 --- a/src/com/android/settings/accounts/AccountPreference.java +++ b/src/com/android/settings/accounts/AccountPreference.java @@ -22,13 +22,13 @@ import android.graphics.drawable.Drawable; import android.util.Log; import android.widget.ImageView; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import java.util.ArrayList; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - /** * AccountPreference is used to display a username, status and provider icon for an account on * the device. diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java index 46a3e6b7776..7130435c24f 100644 --- a/src/com/android/settings/accounts/AccountPreferenceController.java +++ b/src/com/android/settings/accounts/AccountPreferenceController.java @@ -41,6 +41,12 @@ import android.util.ArrayMap; import android.util.Log; import android.util.SparseArray; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.settings.AccessiblePreferenceCategory; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -62,12 +68,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - public class AccountPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, AuthenticatorHelper.OnAccountsUpdateListener, OnPreferenceClickListener, LifecycleObserver, OnPause, OnResume { diff --git a/src/com/android/settings/accounts/AccountSyncPreferenceController.java b/src/com/android/settings/accounts/AccountSyncPreferenceController.java index 3ed19d2cecd..6d58bb884d5 100644 --- a/src/com/android/settings/accounts/AccountSyncPreferenceController.java +++ b/src/com/android/settings/accounts/AccountSyncPreferenceController.java @@ -25,6 +25,10 @@ import android.content.SyncAdapterType; import android.os.Bundle; import android.os.UserHandle; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; @@ -32,10 +36,6 @@ import com.android.settings.core.SubSettingLauncher; import com.android.settingslib.accounts.AuthenticatorHelper; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class AccountSyncPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, AuthenticatorHelper.OnAccountsUpdateListener { diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java index 58624cd3d51..8a33e6c1216 100644 --- a/src/com/android/settings/accounts/AccountSyncSettings.java +++ b/src/com/android/settings/accounts/AccountSyncSettings.java @@ -41,6 +41,9 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; @@ -52,9 +55,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import androidx.appcompat.app.AlertDialog; -import androidx.preference.Preference; - public class AccountSyncSettings extends AccountPreferenceBase { public static final String ACCOUNT_KEY = "account"; diff --git a/src/com/android/settings/accounts/AccountTypePreference.java b/src/com/android/settings/accounts/AccountTypePreference.java index 81bf2e44a7f..54866eeaab2 100644 --- a/src/com/android/settings/accounts/AccountTypePreference.java +++ b/src/com/android/settings/accounts/AccountTypePreference.java @@ -25,13 +25,13 @@ import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; + import com.android.settings.Utils; import com.android.settings.core.SubSettingLauncher; import com.android.settings.widget.AppPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; - public class AccountTypePreference extends AppPreference implements OnPreferenceClickListener { /** * Title of the tile that is shown to the user. diff --git a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java index 90bcb5e0ebc..d32b63013fc 100644 --- a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java +++ b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java @@ -32,6 +32,12 @@ import android.os.UserHandle; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settings.location.LocationSettings; @@ -39,12 +45,6 @@ import com.android.settings.utils.LocalClassLoaderContextThemeWrapper; import com.android.settingslib.accounts.AuthenticatorHelper; import com.android.settingslib.core.instrumentation.Instrumentable; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - /** * Class to load the preference screen to be added to the settings page for the specific account * type as specified in the account-authenticator. diff --git a/src/com/android/settings/accounts/ChooseAccountPreferenceController.java b/src/com/android/settings/accounts/ChooseAccountPreferenceController.java index ded204bde18..5ac5bc07125 100644 --- a/src/com/android/settings/accounts/ChooseAccountPreferenceController.java +++ b/src/com/android/settings/accounts/ChooseAccountPreferenceController.java @@ -33,6 +33,10 @@ import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settingslib.RestrictedLockUtils; @@ -46,10 +50,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * An extra {@link UserHandle} can be specified in the intent as {@link EXTRA_USER}, if the user for * which the action needs to be performed is different to the one the Settings App will run in. diff --git a/src/com/android/settings/accounts/ContactSearchPreferenceController.java b/src/com/android/settings/accounts/ContactSearchPreferenceController.java index adfa7e11fd7..e0ddf24acb7 100644 --- a/src/com/android/settings/accounts/ContactSearchPreferenceController.java +++ b/src/com/android/settings/accounts/ContactSearchPreferenceController.java @@ -19,13 +19,13 @@ import android.content.Context; import android.os.UserHandle; import android.provider.Settings; +import androidx.preference.Preference; + import com.android.settings.core.BasePreferenceController; import com.android.settings.slices.SliceData; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; -import androidx.preference.Preference; - public class ContactSearchPreferenceController extends BasePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java index a24a04e4e8d..31e5613541c 100644 --- a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java +++ b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java @@ -23,6 +23,8 @@ import android.content.res.Resources; import android.os.UserHandle; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.search.SearchIndexableRaw; @@ -30,8 +32,6 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.List; -import androidx.preference.Preference; - public class EmergencyInfoPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java b/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java index aad1172ce12..7a6e5fa2532 100644 --- a/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java +++ b/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java @@ -18,15 +18,15 @@ package com.android.settings.accounts; import android.content.Context; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.FooterPreferenceMixinCompat; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceScreen; - public class EnterpriseDisclosurePreferenceController extends BasePreferenceController { private final EnterprisePrivacyFeatureProvider mFeatureProvider; diff --git a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java index 35201168f85..7753f810d0c 100644 --- a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java +++ b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java @@ -33,6 +33,10 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; @@ -44,10 +48,6 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.io.IOException; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; -import androidx.preference.PreferenceScreen; - public class RemoveAccountPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, OnClickListener { diff --git a/src/com/android/settings/accounts/SyncStateSwitchPreference.java b/src/com/android/settings/accounts/SyncStateSwitchPreference.java index 17cf6b91c90..9c7f739a68a 100644 --- a/src/com/android/settings/accounts/SyncStateSwitchPreference.java +++ b/src/com/android/settings/accounts/SyncStateSwitchPreference.java @@ -25,12 +25,12 @@ import android.util.Log; import android.view.View; import android.widget.TextView; -import com.android.settings.R; -import com.android.settingslib.widget.AnimatedImageView; - import androidx.preference.PreferenceViewHolder; import androidx.preference.SwitchPreference; +import com.android.settings.R; +import com.android.settingslib.widget.AnimatedImageView; + public class SyncStateSwitchPreference extends SwitchPreference { private boolean mIsActive = false; diff --git a/src/com/android/settings/accounts/WorkModePreferenceController.java b/src/com/android/settings/accounts/WorkModePreferenceController.java index fd8a6a9ee7d..f3a6ed2fa82 100644 --- a/src/com/android/settings/accounts/WorkModePreferenceController.java +++ b/src/com/android/settings/accounts/WorkModePreferenceController.java @@ -21,6 +21,11 @@ import android.os.UserHandle; import android.os.UserManager; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.slices.SliceData; @@ -28,11 +33,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; - public class WorkModePreferenceController extends BasePreferenceController implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnStart, OnStop { diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java index 0acb046bcbe..815d0ed34ce 100644 --- a/src/com/android/settings/applications/AppInfoBase.java +++ b/src/com/android/settings/applications/AppInfoBase.java @@ -37,6 +37,10 @@ import android.os.UserManager; import android.text.TextUtils; import android.util.Log; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; @@ -50,10 +54,6 @@ import com.android.settingslib.applications.ApplicationsState.AppEntry; import java.util.ArrayList; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.DialogFragment; -import androidx.fragment.app.Fragment; - public abstract class AppInfoBase extends SettingsPreferenceFragment implements ApplicationsState.Callbacks { diff --git a/src/com/android/settings/applications/AppInfoWithHeader.java b/src/com/android/settings/applications/AppInfoWithHeader.java index 2a4aeb88cbd..863cfd3f77e 100644 --- a/src/com/android/settings/applications/AppInfoWithHeader.java +++ b/src/com/android/settings/applications/AppInfoWithHeader.java @@ -23,11 +23,11 @@ import android.os.Bundle; import android.util.IconDrawableFactory; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.applications.AppUtils; -import androidx.preference.Preference; - public abstract class AppInfoWithHeader extends AppInfoBase { private boolean mCreated; diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java index 82ac1b06ac0..0e2e3c7c0f9 100644 --- a/src/com/android/settings/applications/AppLaunchSettings.java +++ b/src/com/android/settings/applications/AppLaunchSettings.java @@ -35,17 +35,17 @@ import android.util.Log; import android.view.View; import android.view.View.OnClickListener; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.DropDownPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; import java.util.List; -import androidx.appcompat.app.AlertDialog; -import androidx.preference.DropDownPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; - public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListener, Preference.OnPreferenceChangeListener { private static final String TAG = "AppLaunchSettings"; diff --git a/src/com/android/settings/applications/AppStateAppOpsBridge.java b/src/com/android/settings/applications/AppStateAppOpsBridge.java index c96197f540a..0e3ee2d8116 100755 --- a/src/com/android/settings/applications/AppStateAppOpsBridge.java +++ b/src/com/android/settings/applications/AppStateAppOpsBridge.java @@ -29,6 +29,8 @@ import android.util.ArrayMap; import android.util.Log; import android.util.SparseArray; +import androidx.annotation.VisibleForTesting; + import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; @@ -38,8 +40,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import androidx.annotation.VisibleForTesting; - /* * Connects app ops info to the ApplicationsState. Makes use of AppOpsManager to * determine further permission level. diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java index ed5397a0f7e..eaae9483f1c 100644 --- a/src/com/android/settings/applications/AppStorageSettings.java +++ b/src/com/android/settings/applications/AppStorageSettings.java @@ -46,6 +46,13 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; @@ -62,13 +69,6 @@ import java.util.Map; import java.util.Objects; import java.util.TreeMap; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.Loader; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; - public class AppStorageSettings extends AppInfoWithHeader implements OnClickListener, Callbacks, DialogInterface.OnClickListener, LoaderManager.LoaderCallbacks { diff --git a/src/com/android/settings/applications/AppStorageSizesController.java b/src/com/android/settings/applications/AppStorageSizesController.java index 003197770d3..43734b272c4 100644 --- a/src/com/android/settings/applications/AppStorageSizesController.java +++ b/src/com/android/settings/applications/AppStorageSizesController.java @@ -19,13 +19,13 @@ package com.android.settings.applications; import android.content.Context; import android.text.format.Formatter; -import com.android.internal.util.Preconditions; -import com.android.settingslib.applications.StorageStatsSource; - import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.preference.Preference; +import com.android.internal.util.Preconditions; +import com.android.settingslib.applications.StorageStatsSource; + /** * Handles setting the sizes for the app info screen. */ diff --git a/src/com/android/settings/applications/ClearDefaultsPreference.java b/src/com/android/settings/applications/ClearDefaultsPreference.java index 76940e5dc90..768fb4ea99c 100644 --- a/src/com/android/settings/applications/ClearDefaultsPreference.java +++ b/src/com/android/settings/applications/ClearDefaultsPreference.java @@ -33,14 +33,14 @@ import android.view.View; import android.widget.Button; import android.widget.TextView; -import com.android.settings.R; -import com.android.settingslib.applications.AppUtils; -import com.android.settingslib.applications.ApplicationsState; - import androidx.core.content.res.TypedArrayUtils; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; +import com.android.settingslib.applications.AppUtils; +import com.android.settingslib.applications.ApplicationsState; + public class ClearDefaultsPreference extends Preference { protected static final String TAG = ClearDefaultsPreference.class.getSimpleName(); diff --git a/src/com/android/settings/applications/DirectoryAccessDetails.java b/src/com/android/settings/applications/DirectoryAccessDetails.java index 8325f0d63ac..f158d81780a 100644 --- a/src/com/android/settings/applications/DirectoryAccessDetails.java +++ b/src/com/android/settings/applications/DirectoryAccessDetails.java @@ -29,6 +29,7 @@ import static android.os.storage.StorageVolume.ScopedAccessProviderContract .TABLE_PERMISSIONS_COL_PACKAGE; import static android.os.storage.StorageVolume.ScopedAccessProviderContract .TABLE_PERMISSIONS_COL_VOLUME_UUID; + import static com.android.settings.applications.AppStateDirectoryAccessBridge.DEBUG; import static com.android.settings.applications.AppStateDirectoryAccessBridge.VERBOSE; @@ -46,6 +47,12 @@ import android.util.IconDrawableFactory; import android.util.Log; import android.util.Pair; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.widget.EntityHeaderController; @@ -59,12 +66,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import androidx.appcompat.app.AlertDialog; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - /** * Detailed settings for an app's directory access permissions (A.K.A Scoped Directory Access). * diff --git a/src/com/android/settings/applications/LayoutPreference.java b/src/com/android/settings/applications/LayoutPreference.java index 393e198d0a2..cc077cc7539 100644 --- a/src/com/android/settings/applications/LayoutPreference.java +++ b/src/com/android/settings/applications/LayoutPreference.java @@ -24,14 +24,14 @@ import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.android.settings.R; -import com.android.settings.Utils; - import androidx.annotation.VisibleForTesting; import androidx.core.content.res.TypedArrayUtils; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; +import com.android.settings.Utils; + public class LayoutPreference extends Preference { private final View.OnClickListener mClickListener = v -> performClick(v); diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java index e57808f865a..59de758b4a0 100644 --- a/src/com/android/settings/applications/ProcessStatsDetail.java +++ b/src/com/android/settings/applications/ProcessStatsDetail.java @@ -43,6 +43,10 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.CancellablePreference; import com.android.settings.CancellablePreference.OnCancelListener; @@ -58,10 +62,6 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; -import androidx.appcompat.app.AlertDialog; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; - public class ProcessStatsDetail extends SettingsPreferenceFragment { private static final String TAG = "ProcessStatsDetail"; diff --git a/src/com/android/settings/applications/ProcessStatsSummary.java b/src/com/android/settings/applications/ProcessStatsSummary.java index 03ea490d2a5..c32bac74db3 100644 --- a/src/com/android/settings/applications/ProcessStatsSummary.java +++ b/src/com/android/settings/applications/ProcessStatsSummary.java @@ -21,6 +21,9 @@ import android.os.Bundle; import android.text.format.Formatter; import android.text.format.Formatter.BytesResult; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SummaryPreference; @@ -29,9 +32,6 @@ import com.android.settings.applications.ProcStatsData.MemInfo; import com.android.settings.core.SubSettingLauncher; import com.android.settings.dashboard.SummaryLoader; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; - public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenceClickListener { private static final String KEY_STATUS_HEADER = "status_header"; diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java index 774d769cae0..25f9c7eec5b 100644 --- a/src/com/android/settings/applications/ProcessStatsUi.java +++ b/src/com/android/settings/applications/ProcessStatsUi.java @@ -25,6 +25,9 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + import com.android.internal.app.procstats.ProcessStats; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -35,9 +38,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; - public class ProcessStatsUi extends ProcessStatsBase { static final String TAG = "ProcessStatsUi"; static final boolean DEBUG = false; diff --git a/src/com/android/settings/applications/RecentAppsPreferenceController.java b/src/com/android/settings/applications/RecentAppsPreferenceController.java index 24ffd141fd7..b3c8bc465f7 100644 --- a/src/com/android/settings/applications/RecentAppsPreferenceController.java +++ b/src/com/android/settings/applications/RecentAppsPreferenceController.java @@ -32,6 +32,12 @@ import android.util.ArraySet; import android.util.IconDrawableFactory; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; import com.android.settings.core.PreferenceControllerMixin; @@ -50,12 +56,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import androidx.annotation.VisibleForTesting; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - /** * This controller displays a list of recently used apps and a "See all" button. If there is * no recently used app, "See all" will be displayed as "App info". diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java index 66fdb088e93..272945c7454 100644 --- a/src/com/android/settings/applications/RunningServiceDetails.java +++ b/src/com/android/settings/applications/RunningServiceDetails.java @@ -29,6 +29,9 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; @@ -43,9 +46,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collections; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.DialogFragment; - public class RunningServiceDetails extends InstrumentedFragment implements RunningState.OnRefreshUiListener { static final String TAG = "RunningServicesDetails"; diff --git a/src/com/android/settings/applications/SpacePreference.java b/src/com/android/settings/applications/SpacePreference.java index 95343b2acc9..6575ad1dfa7 100644 --- a/src/com/android/settings/applications/SpacePreference.java +++ b/src/com/android/settings/applications/SpacePreference.java @@ -20,12 +20,12 @@ import android.content.res.TypedArray; import android.util.AttributeSet; import android.view.ViewGroup.LayoutParams; -import com.android.settings.R; - import androidx.core.content.res.TypedArrayUtils; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; + /** * A blank preference that has a specified height by android:layout_height. It can be used * to fine tune screens that combine custom layouts and standard preferences. diff --git a/src/com/android/settings/applications/UsageAccessDetails.java b/src/com/android/settings/applications/UsageAccessDetails.java index c14ddbc047d..62ce08e0a77 100644 --- a/src/com/android/settings/applications/UsageAccessDetails.java +++ b/src/com/android/settings/applications/UsageAccessDetails.java @@ -25,11 +25,6 @@ import android.content.pm.ResolveInfo; import android.os.Bundle; import android.provider.Settings; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.R; -import com.android.settings.applications.AppStateUsageBridge.UsageState; -import com.android.settings.overlay.FeatureFactory; - import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; @@ -37,6 +32,11 @@ import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.SwitchPreference; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settings.R; +import com.android.settings.applications.AppStateUsageBridge.UsageState; +import com.android.settings.overlay.FeatureFactory; + public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenceChangeListener, OnPreferenceClickListener { diff --git a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java index 4dab72b1230..6e4818ab92f 100644 --- a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java @@ -22,10 +22,15 @@ import android.os.BatteryStats; import android.os.Bundle; import android.os.UserManager; +import androidx.annotation.VisibleForTesting; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; -import com.android.settings.SettingsActivity; import com.android.settings.Utils; import com.android.settings.core.BasePreferenceController; import com.android.settings.fuelgauge.AdvancedPowerUsageDetail; @@ -40,12 +45,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.Loader; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class AppBatteryPreferenceController extends BasePreferenceController implements LoaderManager.LoaderCallbacks, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java index 69fa71d835a..d6dfe647de6 100644 --- a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java @@ -40,6 +40,10 @@ import android.util.Log; import android.view.View; import android.webkit.IWebViewUpdateService; +import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -63,10 +67,6 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.fragment.app.Fragment; -import androidx.preference.PreferenceScreen; - /** * Controller to control the uninstall button and forcestop button. All fragments that use * this controller should implement {@link ButtonActionDialogFragment.AppButtonsDialogListener} and diff --git a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java index 61502d0f4cd..049b212461b 100644 --- a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java @@ -26,6 +26,12 @@ import android.os.ServiceManager; import android.text.format.DateUtils; import android.text.format.Formatter; +import androidx.annotation.VisibleForTesting; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; @@ -39,12 +45,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.net.ChartData; import com.android.settingslib.net.ChartDataLoaderCompat; -import androidx.annotation.VisibleForTesting; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.Loader; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class AppDataUsagePreferenceController extends AppInfoPreferenceControllerBase implements LoaderManager.LoaderCallbacks, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java b/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java index 7fd8fe58e98..c86117503fd 100644 --- a/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java @@ -20,6 +20,8 @@ import android.app.Activity; import android.content.Context; import android.content.pm.PackageInfo; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.applications.LayoutPreference; @@ -31,8 +33,6 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; -import androidx.preference.PreferenceScreen; - public class AppHeaderViewPreferenceController extends BasePreferenceController implements AppInfoDashboardFragment.Callback, LifecycleObserver, OnStart { diff --git a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java index 4ef5b03c4e4..422c3055305 100755 --- a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java +++ b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java @@ -39,6 +39,8 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -59,8 +61,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import androidx.annotation.VisibleForTesting; - /** * Dashboard fragment to display application information from Settings. This activity presents * extended information associated with a package like code, data, total size, permissions diff --git a/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java index ce8dd44934b..c495cbc50c8 100644 --- a/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java +++ b/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java @@ -20,12 +20,12 @@ import android.content.Context; import android.os.Bundle; import android.text.TextUtils; -import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.core.BasePreferenceController; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.SettingsPreferenceFragment; +import com.android.settings.core.BasePreferenceController; + /* * Abstract base controller for the app detail preferences that refresh the state when the app state * changes and launch a specific detail fragment when the preference is clicked. diff --git a/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java b/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java index 2a8217a27be..bf8567684ec 100644 --- a/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java @@ -20,13 +20,13 @@ import android.content.Context; import android.content.Intent; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.applications.AppStoreUtil; import com.android.settingslib.applications.AppUtils; -import androidx.preference.Preference; - public class AppInstallerInfoPreferenceController extends AppInfoPreferenceControllerBase { private String mPackageName; diff --git a/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java index d847d491c98..19e8ebbb297 100644 --- a/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java @@ -22,6 +22,9 @@ import android.content.pm.PackageInfo; import android.os.AsyncTask; import android.text.format.Formatter; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.applications.ProcStatsData; @@ -34,9 +37,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.development.DevelopmentSettingsEnabler; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class AppMemoryPreferenceController extends BasePreferenceController implements LifecycleObserver, OnResume { diff --git a/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java index 0d34d51c5b5..07e14d4b1aa 100644 --- a/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java @@ -21,14 +21,14 @@ import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY; import android.content.Context; import android.os.Bundle; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.notification.AppNotificationSettings; import com.android.settings.notification.NotificationBackend; import com.android.settingslib.applications.ApplicationsState; -import androidx.preference.Preference; - public class AppNotificationPreferenceController extends AppInfoPreferenceControllerBase { private String mChannelId = null; diff --git a/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java b/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java index 1901dd247d9..7f64e3b48b1 100644 --- a/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java @@ -23,14 +23,14 @@ import android.content.pm.PackageManager; import android.hardware.usb.IUsbManager; import android.os.ServiceManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.AppLaunchSettings; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class AppOpenByDefaultPreferenceController extends AppInfoPreferenceControllerBase { private IUsbManager mUsbManager; diff --git a/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java b/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java index 76211edd7cd..12393ad13f7 100644 --- a/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java @@ -23,15 +23,15 @@ import android.content.res.Resources; import android.icu.text.ListFormatter; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settingslib.applications.PermissionsSummaryHelper; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - public class AppPermissionPreferenceController extends AppInfoPreferenceControllerBase { private static final String TAG = "PermissionPrefControl"; diff --git a/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java b/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java index d20fe55b267..f5ce18e0080 100644 --- a/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java @@ -23,10 +23,10 @@ import android.content.Intent; import android.content.pm.ResolveInfo; import android.text.TextUtils; -import com.android.settings.overlay.FeatureFactory; - import androidx.preference.Preference; +import com.android.settings.overlay.FeatureFactory; + public class AppSettingPreferenceController extends AppInfoPreferenceControllerBase { private String mPackageName; diff --git a/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java b/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java index 7ff13014f1a..d887634a540 100644 --- a/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java @@ -22,6 +22,11 @@ import android.os.Bundle; import android.os.UserHandle; import android.text.format.Formatter; +import androidx.annotation.VisibleForTesting; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.AppStorageSettings; @@ -31,11 +36,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.annotation.VisibleForTesting; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.Loader; -import androidx.preference.Preference; - public class AppStoragePreferenceController extends AppInfoPreferenceControllerBase implements LoaderManager.LoaderCallbacks, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java b/src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java index eeeb205f0fe..a0a8fb6fdaf 100644 --- a/src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java +++ b/src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java @@ -20,6 +20,10 @@ import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; +import androidx.annotation.IntDef; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -27,10 +31,6 @@ import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import androidx.annotation.IntDef; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; - /** * Fragment to show the dialog for uninstall or forcestop. This fragment uses function in * target fragment to handle the dialog button click. diff --git a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java index 2683e1603e4..fbded33fa6a 100644 --- a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java +++ b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java @@ -19,6 +19,8 @@ import android.os.Bundle; import android.os.UserManager; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -26,8 +28,6 @@ import com.android.settings.applications.DefaultAppSettings; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.SubSettingLauncher; -import androidx.preference.Preference; - /* * Abstract base controller for the default app shortcut preferences that launches the default app * settings with the corresponding default app highlighted. diff --git a/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java b/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java index 8c572af024b..6f2cf3514f1 100644 --- a/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java +++ b/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java @@ -27,6 +27,13 @@ import android.provider.Settings; import android.view.Window; import android.view.WindowManager; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; @@ -36,13 +43,6 @@ import com.android.settings.applications.AppStateOverlayBridge.OverlayState; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.applications.ApplicationsState.AppEntry; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.SwitchPreference; - public class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenceChangeListener, OnPreferenceClickListener { diff --git a/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java b/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java index 16f0299ae62..ec2508f107a 100644 --- a/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java @@ -20,12 +20,12 @@ import android.content.Context; import android.content.pm.PackageInfo; import android.os.UserManager; -import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.applications.AppStateInstallAppsBridge; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; +import com.android.settings.SettingsPreferenceFragment; +import com.android.settings.applications.AppStateInstallAppsBridge; + public class ExternalSourceDetailPreferenceController extends AppInfoPreferenceControllerBase { private String mPackageName; diff --git a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java index 224072c9885..be41c0ff5cc 100644 --- a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java +++ b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java @@ -24,6 +24,10 @@ import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Settings; @@ -33,10 +37,6 @@ import com.android.settings.applications.AppStateInstallAppsBridge.InstallAppsSt import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.applications.ApplicationsState.AppEntry; -import androidx.appcompat.app.AlertDialog; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; - public class ExternalSourcesDetails extends AppInfoWithHeader implements OnPreferenceChangeListener { diff --git a/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java b/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java index 683a764f7e0..808d018136f 100644 --- a/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java +++ b/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java @@ -22,13 +22,13 @@ import android.content.pm.PackageManager; import android.os.Bundle; import android.os.UserHandle; +import androidx.appcompat.app.AlertDialog; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.overlay.FeatureFactory; -import androidx.appcompat.app.AlertDialog; - /** * Fragment to show the dialog for clearing the instant app. */ diff --git a/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java b/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java index 87f6cefac9e..f710f2e3b18 100644 --- a/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java @@ -29,6 +29,9 @@ import android.view.MenuItem; import android.view.View; import android.widget.Button; +import androidx.fragment.app.DialogFragment; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.AppStoreUtil; import com.android.settings.applications.LayoutPreference; @@ -42,9 +45,6 @@ import com.android.settingslib.core.lifecycle.events.OnPrepareOptionsMenu; import java.util.List; -import androidx.fragment.app.DialogFragment; -import androidx.preference.PreferenceScreen; - public class InstantAppButtonsPreferenceController extends BasePreferenceController implements LifecycleObserver, OnCreateOptionsMenu, OnPrepareOptionsMenu, OnOptionsItemSelected { diff --git a/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java b/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java index e1025188fdb..cbb805f3554 100644 --- a/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java @@ -19,14 +19,14 @@ package com.android.settings.applications.appinfo; import android.content.Context; import android.content.pm.PackageManager; +import androidx.preference.Preference; + import com.android.settings.Utils; import com.android.settings.applications.AppDomainsPreference; import com.android.settingslib.applications.AppUtils; import java.util.Set; -import androidx.preference.Preference; - public class InstantAppDomainsPreferenceController extends AppInfoPreferenceControllerBase { private PackageManager mPackageManager; diff --git a/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java b/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java index 16a1535fe34..a4cfebfcb25 100644 --- a/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java @@ -23,14 +23,14 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.text.TextUtils; -import com.android.settings.core.BasePreferenceController; - -import java.util.List; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.core.BasePreferenceController; + +import java.util.List; + public class TimeSpentInAppPreferenceController extends BasePreferenceController { @VisibleForTesting diff --git a/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java b/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java index aed263fbb3f..e126b5eb7a7 100644 --- a/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java +++ b/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java @@ -23,6 +23,12 @@ import android.content.pm.ResolveInfo; import android.os.Bundle; import android.provider.Settings; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; @@ -32,12 +38,6 @@ import com.android.settings.applications.AppStateWriteSettingsBridge.WriteSettin import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.applications.ApplicationsState.AppEntry; -import androidx.appcompat.app.AlertDialog; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.SwitchPreference; - public class WriteSettingsDetails extends AppInfoWithHeader implements OnPreferenceChangeListener, OnPreferenceClickListener { diff --git a/src/com/android/settings/applications/appops/AppOpsCategory.java b/src/com/android/settings/applications/appops/AppOpsCategory.java index bdc96897454..57d7dc4c490 100644 --- a/src/com/android/settings/applications/appops/AppOpsCategory.java +++ b/src/com/android/settings/applications/appops/AppOpsCategory.java @@ -34,16 +34,16 @@ import android.widget.ListView; import android.widget.Switch; import android.widget.TextView; -import com.android.settings.R; -import com.android.settings.applications.appops.AppOpsState.AppOpEntry; - -import java.util.List; - import androidx.fragment.app.ListFragment; import androidx.loader.app.LoaderManager; import androidx.loader.content.AsyncTaskLoader; import androidx.loader.content.Loader; +import com.android.settings.R; +import com.android.settings.applications.appops.AppOpsState.AppOpEntry; + +import java.util.List; + public class AppOpsCategory extends ListFragment implements LoaderManager.LoaderCallbacks> { diff --git a/src/com/android/settings/applications/appops/BackgroundCheckSummary.java b/src/com/android/settings/applications/appops/BackgroundCheckSummary.java index 1d804ceb697..601a566a39f 100644 --- a/src/com/android/settings/applications/appops/BackgroundCheckSummary.java +++ b/src/com/android/settings/applications/appops/BackgroundCheckSummary.java @@ -23,12 +23,12 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.fragment.app.FragmentTransaction; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.InstrumentedPreferenceFragment; -import androidx.fragment.app.FragmentTransaction; - public class BackgroundCheckSummary extends InstrumentedPreferenceFragment { // layout inflater object used to inflate views private LayoutInflater mInflater; diff --git a/src/com/android/settings/applications/assist/AssistContextPreferenceController.java b/src/com/android/settings/applications/assist/AssistContextPreferenceController.java index 786fc85f4ae..3e5c4ec5280 100644 --- a/src/com/android/settings/applications/assist/AssistContextPreferenceController.java +++ b/src/com/android/settings/applications/assist/AssistContextPreferenceController.java @@ -21,6 +21,10 @@ import android.net.Uri; import android.os.UserHandle; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + import com.android.internal.app.AssistUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -32,10 +36,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.Arrays; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; - public class AssistContextPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java index d8ab6093fb8..1880accb6d0 100644 --- a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java +++ b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java @@ -22,6 +22,11 @@ import android.net.Uri; import android.os.UserHandle; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + import com.android.internal.app.AssistUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -33,11 +38,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.Arrays; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; - public class AssistFlashScreenPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java index a2a8f289f9b..59479438c25 100644 --- a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java +++ b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java @@ -21,6 +21,10 @@ import android.net.Uri; import android.os.UserHandle; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + import com.android.internal.app.AssistUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -32,10 +36,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.Arrays; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; - public class AssistScreenshotPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/applications/assist/AssistSettingObserver.java b/src/com/android/settings/applications/assist/AssistSettingObserver.java index 917552a7b08..f0da694a3a8 100644 --- a/src/com/android/settings/applications/assist/AssistSettingObserver.java +++ b/src/com/android/settings/applications/assist/AssistSettingObserver.java @@ -21,12 +21,12 @@ import android.database.ContentObserver; import android.net.Uri; import android.provider.Settings; +import androidx.annotation.MainThread; + import com.android.settingslib.utils.ThreadUtils; import java.util.List; -import androidx.annotation.MainThread; - public abstract class AssistSettingObserver extends ContentObserver { private final Uri ASSIST_URI = diff --git a/src/com/android/settings/applications/assist/DefaultAssistPicker.java b/src/com/android/settings/applications/assist/DefaultAssistPicker.java index f1b32691b22..d8670708a57 100644 --- a/src/com/android/settings/applications/assist/DefaultAssistPicker.java +++ b/src/com/android/settings/applications/assist/DefaultAssistPicker.java @@ -29,6 +29,8 @@ import android.speech.RecognitionService; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.internal.app.AssistUtils; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; @@ -39,8 +41,6 @@ import com.android.settingslib.widget.CandidateInfo; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; - public class DefaultAssistPicker extends DefaultAppPickerFragment { private static final String TAG = "DefaultAssistPicker"; diff --git a/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java b/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java index 1c900b85fc9..f95f96adee5 100644 --- a/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java +++ b/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java @@ -24,6 +24,8 @@ import android.content.pm.ResolveInfo; import android.service.voice.VoiceInteractionService; import android.service.voice.VoiceInteractionServiceInfo; +import androidx.annotation.VisibleForTesting; + import com.android.internal.app.AssistUtils; import com.android.settings.R; import com.android.settings.applications.defaultapps.DefaultAppPreferenceController; @@ -31,8 +33,6 @@ import com.android.settingslib.applications.DefaultAppInfo; import java.util.List; -import androidx.annotation.VisibleForTesting; - public class DefaultAssistPreferenceController extends DefaultAppPreferenceController { private final AssistUtils mAssistUtils; diff --git a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java index 0f0ebe8db92..1f8b9d1a5cc 100644 --- a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java +++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java @@ -22,6 +22,9 @@ import android.content.Intent; import android.net.Uri; import android.text.TextUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.app.AssistUtils; import com.android.settings.applications.defaultapps.DefaultAppPreferenceController; import com.android.settingslib.applications.DefaultAppInfo; @@ -32,9 +35,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class DefaultVoiceInputPreferenceController extends DefaultAppPreferenceController implements LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/applications/defaultapps/AutofillPicker.java b/src/com/android/settings/applications/defaultapps/AutofillPicker.java index 3f392e59a08..6691d2fd84a 100644 --- a/src/com/android/settings/applications/defaultapps/AutofillPicker.java +++ b/src/com/android/settings/applications/defaultapps/AutofillPicker.java @@ -19,18 +19,14 @@ package com.android.settings.applications.defaultapps; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; -import com.android.settings.applications.defaultapps.DefaultAutofillPreferenceController; -import com.android.settings.applications.defaultapps.DefaultWorkAutofillPreferenceController; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.search.SearchIndexable; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java index 395ea64d13f..9a337a5943f 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java +++ b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java @@ -24,6 +24,11 @@ import android.os.Bundle; import android.text.TextUtils; import android.util.Pair; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -33,11 +38,6 @@ import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.widget.CandidateInfo; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.DialogFragment; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; - /** * A generic app picker fragment that shows a list of app as radio button group. */ diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java index 78248e67c93..73d80a34363 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java +++ b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java @@ -27,6 +27,8 @@ import android.os.UserManager; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.PreferenceControllerMixin; @@ -35,8 +37,6 @@ import com.android.settingslib.TwoTargetPreference; import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; - public abstract class DefaultAppPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java index b281336d0be..459a5b778df 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java +++ b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java @@ -34,14 +34,16 @@ import android.service.autofill.AutofillServiceInfo; import android.text.Html; import android.text.TextUtils; import android.util.Log; + import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; + import com.android.internal.content.PackageMonitor; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.utils.ThreadUtils; import com.android.settingslib.widget.CandidateInfo; + import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java index d3c52b5e948..ec6ea8cba9e 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java +++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java @@ -29,14 +29,14 @@ import android.util.ArraySet; import android.util.IconDrawableFactory; import android.util.Log; +import androidx.preference.Preference; + import com.android.settingslib.applications.DefaultAppInfo; import java.util.ArrayList; import java.util.List; import java.util.Set; -import androidx.preference.Preference; - public class DefaultBrowserPreferenceController extends DefaultAppPreferenceController { private static final String TAG = "BrowserPrefCtrl"; diff --git a/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java index 5e06d6cf451..55803c50f28 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java +++ b/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java @@ -21,13 +21,13 @@ import android.content.pm.PackageManager; import android.nfc.NfcAdapter; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.nfc.PaymentBackend; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; - public class DefaultPaymentSettingsPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java b/src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java index b5a2880461e..f8b1596df1b 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java +++ b/src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java @@ -16,7 +16,6 @@ package com.android.settings.applications.defaultapps; -import android.app.AppOpsManager; import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; @@ -26,7 +25,6 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.internal.telephony.SmsApplication; import com.android.settings.R; import com.android.settings.Utils; -import com.android.settings.fuelgauge.BatteryUtils; import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.widget.CandidateInfo; diff --git a/src/com/android/settings/applications/defaultapps/DefaultWorkAutofillPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultWorkAutofillPreferenceController.java index ea4eff6b657..47735ac17c9 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultWorkAutofillPreferenceController.java +++ b/src/com/android/settings/applications/defaultapps/DefaultWorkAutofillPreferenceController.java @@ -23,6 +23,7 @@ import android.content.Intent; import android.os.UserHandle; import android.provider.Settings; import android.text.TextUtils; + import com.android.settings.Utils; import com.android.settingslib.applications.DefaultAppInfo; diff --git a/src/com/android/settings/applications/manageapplications/AppFilterItem.java b/src/com/android/settings/applications/manageapplications/AppFilterItem.java index 09f88347eba..8ba7a4c2c2e 100644 --- a/src/com/android/settings/applications/manageapplications/AppFilterItem.java +++ b/src/com/android/settings/applications/manageapplications/AppFilterItem.java @@ -16,12 +16,12 @@ package com.android.settings.applications.manageapplications; +import androidx.annotation.StringRes; + import com.android.settingslib.applications.ApplicationsState; import java.util.Objects; -import androidx.annotation.StringRes; - /** * Data model for a displayable app filter. */ diff --git a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java index dc4f22454a0..2e4a640de4d 100644 --- a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java +++ b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java @@ -16,6 +16,8 @@ package com.android.settings.applications.manageapplications; +import androidx.annotation.IntDef; + import com.android.settings.R; import com.android.settings.applications.AppStateDirectoryAccessBridge; import com.android.settings.applications.AppStateInstallAppsBridge; @@ -27,8 +29,6 @@ import com.android.settings.applications.AppStateWriteSettingsBridge; import com.android.settings.wifi.AppStateChangeWifiStateBridge; import com.android.settingslib.applications.ApplicationsState; -import androidx.annotation.IntDef; - /** * A registry and helper class that manages all {@link AppFilterItem}s for ManageApplications UI. */ diff --git a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java index 5e1c710a15b..021a953db33 100644 --- a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java +++ b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java @@ -28,14 +28,14 @@ import android.widget.ImageView; import android.widget.Switch; import android.widget.TextView; -import com.android.settings.R; -import com.android.settingslib.applications.ApplicationsState; -import com.android.settingslib.applications.ApplicationsState.AppEntry; - import androidx.annotation.StringRes; import androidx.annotation.VisibleForTesting; import androidx.recyclerview.widget.RecyclerView; +import com.android.settings.R; +import com.android.settingslib.applications.ApplicationsState; +import com.android.settingslib.applications.ApplicationsState.AppEntry; + public class ApplicationViewHolder extends RecyclerView.ViewHolder { private final TextView mAppName; diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java index a64f4611963..eb258ac2ad8 100644 --- a/src/com/android/settings/applications/manageapplications/ManageApplications.java +++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java @@ -17,6 +17,7 @@ package com.android.settings.applications.manageapplications; import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE; + import static com.android.settings.applications.manageapplications.AppFilterRegistry .FILTER_APPS_ALL; import static com.android.settings.applications.manageapplications.AppFilterRegistry @@ -68,6 +69,11 @@ import android.widget.ArrayAdapter; import android.widget.FrameLayout; import android.widget.Spinner; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Settings; @@ -127,11 +133,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.Set; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - /** * Activity to pick an application that will be used to display installation information and * options to uninstall/delete user data for system applications. This activity diff --git a/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java b/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java index c93ae134289..53c778c7d60 100644 --- a/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java +++ b/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java @@ -23,15 +23,15 @@ import android.provider.DocumentsContract; import android.text.format.Formatter; import android.util.Log; +import androidx.annotation.WorkerThread; +import androidx.fragment.app.Fragment; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.applications.StorageStatsSource; import java.io.IOException; -import androidx.annotation.WorkerThread; -import androidx.fragment.app.Fragment; - /** * MusicViewHolderController controls an Audio/Music file view in the ManageApplications view. */ diff --git a/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java b/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java index 55fbc52bb2f..c7a1a1cb49f 100644 --- a/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java +++ b/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java @@ -22,15 +22,15 @@ import android.os.UserHandle; import android.text.format.Formatter; import android.util.Log; +import androidx.annotation.WorkerThread; +import androidx.fragment.app.Fragment; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.applications.StorageStatsSource; import java.io.IOException; -import androidx.annotation.WorkerThread; -import androidx.fragment.app.Fragment; - /** PhotosViewHolderController controls an Audio/Music file view in the ManageApplications view. */ public class PhotosViewHolderController implements FileViewHolderController { private static final String TAG = "PhotosViewHolderCtrl"; diff --git a/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java b/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java index 17c2f5a8434..6ef45935d4a 100644 --- a/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java +++ b/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java @@ -20,6 +20,8 @@ import android.content.Context; import android.os.Bundle; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -27,8 +29,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnCreate; import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState; -import androidx.preference.Preference; - public class ResetAppPrefPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnCreate, OnSaveInstanceState { diff --git a/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java b/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java index 4e38f4e57f6..ec4cc1e38ab 100644 --- a/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java +++ b/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java @@ -34,12 +34,12 @@ import android.os.ServiceManager; import android.os.UserHandle; import android.webkit.IWebViewUpdateService; +import androidx.appcompat.app.AlertDialog; + import com.android.settings.R; import java.util.List; -import androidx.appcompat.app.AlertDialog; - public class ResetAppsHelper implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener { diff --git a/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java b/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java index a9feedc49a6..ef9d5d418a7 100644 --- a/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java +++ b/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java @@ -23,13 +23,13 @@ import android.util.ArraySet; import android.util.IconDrawableFactory; import android.view.View; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.widget.AppPreference; import com.android.settingslib.applications.ApplicationsState.AppEntry; -import androidx.preference.PreferenceViewHolder; - public class DomainAppPreference extends AppPreference { private final AppEntry mEntry; diff --git a/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceController.java b/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceController.java index cb89c9a95b7..12d151296c3 100644 --- a/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceController.java +++ b/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceController.java @@ -22,6 +22,10 @@ import android.text.TextUtils; import android.util.ArrayMap; import android.util.IconDrawableFactory; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.AppInfoBase; import com.android.settings.applications.AppLaunchSettings; @@ -32,10 +36,6 @@ import com.android.settingslib.applications.ApplicationsState.AppEntry; import java.util.ArrayList; import java.util.Map; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - public class DomainAppPreferenceController extends BasePreferenceController implements ApplicationsState.Callbacks { diff --git a/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceController.java b/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceController.java index 36fd788a16c..86c88c9f05f 100644 --- a/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceController.java +++ b/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceController.java @@ -20,10 +20,10 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; -import com.android.settings.core.BasePreferenceController; - import androidx.preference.Preference; +import com.android.settings.core.BasePreferenceController; + public class InstantAppAccountPreferenceController extends BasePreferenceController { private Intent mLaunchIntent; diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java index c7e93b80b4e..553680f298e 100644 --- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java +++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java @@ -57,6 +57,8 @@ import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.EventLogTags; import com.android.settings.R; @@ -73,8 +75,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import androidx.appcompat.app.AlertDialog; - public class DeviceAdminAdd extends Activity { static final String TAG = "DeviceAdminAdd"; diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java index fe4ae1d7f1e..0ff4233d055 100644 --- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java +++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java @@ -39,6 +39,12 @@ import android.util.ArrayMap; import android.util.Log; import android.util.SparseArray; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; @@ -53,12 +59,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - public class DeviceAdminListPreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart, OnStop { diff --git a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceController.java b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceController.java index a2ece7212dc..1f94ed1452c 100644 --- a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceController.java +++ b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceController.java @@ -22,12 +22,12 @@ import android.content.pm.PackageManager; import android.os.UserHandle; import android.util.Log; -import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.applications.appinfo.AppInfoPreferenceControllerBase; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; +import com.android.settings.SettingsPreferenceFragment; +import com.android.settings.applications.appinfo.AppInfoPreferenceControllerBase; + public class PictureInPictureDetailPreferenceController extends AppInfoPreferenceControllerBase { private static final String TAG = "PicInPicDetailControl"; diff --git a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java index 79606ee81b8..33a779fd9e7 100644 --- a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java +++ b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java @@ -23,17 +23,17 @@ import android.app.AppOpsManager; import android.content.Context; import android.os.Bundle; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.R; -import com.android.settings.applications.AppInfoWithHeader; -import com.android.settings.overlay.FeatureFactory; - import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.SwitchPreference; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settings.R; +import com.android.settings.applications.AppInfoWithHeader; +import com.android.settings.overlay.FeatureFactory; + public class PictureInPictureDetails extends AppInfoWithHeader implements OnPreferenceChangeListener { diff --git a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java index a3997523768..d6734b71f8d 100644 --- a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java +++ b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java @@ -32,6 +32,11 @@ import android.util.IconDrawableFactory; import android.util.Pair; import android.view.View; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppInfoBase; @@ -47,11 +52,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceScreen; - @SearchIndexable public class PictureInPictureSettings extends EmptyTextSettings { diff --git a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java index e5907ce9459..5c0d4b145aa 100644 --- a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java +++ b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java @@ -23,6 +23,13 @@ import android.os.Bundle; import android.provider.SearchIndexableResource; import android.view.View; +import androidx.annotation.VisibleForTesting; +import androidx.preference.DropDownPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.telephony.SmsUsageMonitor; import com.android.settings.R; @@ -43,13 +50,6 @@ import com.android.settingslib.widget.FooterPreference; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.DropDownPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceScreen; -import androidx.preference.PreferenceViewHolder; - @SearchIndexable public class PremiumSmsAccess extends EmptyTextSettings implements Callback, Callbacks, OnPreferenceChangeListener { diff --git a/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java b/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java index 6cf52eccebd..cad59571c58 100644 --- a/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java +++ b/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java @@ -21,6 +21,8 @@ import android.provider.SearchIndexableResource; import android.provider.Settings; import android.service.vr.VrListenerService; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; @@ -32,8 +34,6 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; - @SearchIndexable public class VrListenerSettings extends ManagedServiceSettings { private static final String TAG = VrListenerSettings.class.getSimpleName(); diff --git a/src/com/android/settings/backup/AutoRestorePreferenceController.java b/src/com/android/settings/backup/AutoRestorePreferenceController.java index 46802998d81..4dd2eb651d3 100644 --- a/src/com/android/settings/backup/AutoRestorePreferenceController.java +++ b/src/com/android/settings/backup/AutoRestorePreferenceController.java @@ -24,11 +24,11 @@ import android.os.ServiceManager; import android.provider.Settings; import android.util.Log; -import com.android.settings.core.TogglePreferenceController; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.TogglePreferenceController; + public class AutoRestorePreferenceController extends TogglePreferenceController { private static final String TAG = "AutoRestorePrefCtrler"; diff --git a/src/com/android/settings/backup/BackupDataPreferenceController.java b/src/com/android/settings/backup/BackupDataPreferenceController.java index 3ad3e8054bd..25ef58c62c3 100644 --- a/src/com/android/settings/backup/BackupDataPreferenceController.java +++ b/src/com/android/settings/backup/BackupDataPreferenceController.java @@ -18,11 +18,11 @@ package com.android.settings.backup; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import androidx.preference.Preference; - public class BackupDataPreferenceController extends BasePreferenceController { private PrivacySettingsConfigData mPSCD; diff --git a/src/com/android/settings/backup/BackupSettingsActivity.java b/src/com/android/settings/backup/BackupSettingsActivity.java index c17d1e75da3..615dbf37e85 100644 --- a/src/com/android/settings/backup/BackupSettingsActivity.java +++ b/src/com/android/settings/backup/BackupSettingsActivity.java @@ -23,6 +23,10 @@ import android.os.Bundle; import android.os.UserHandle; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; + import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -32,10 +36,6 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.fragment.app.FragmentActivity; -import androidx.fragment.app.FragmentManager; - /** * The activity used to launch the configured Backup activity or the preference screen diff --git a/src/com/android/settings/backup/BackupSettingsHelper.java b/src/com/android/settings/backup/BackupSettingsHelper.java index 33832169290..b35d6b2be57 100644 --- a/src/com/android/settings/backup/BackupSettingsHelper.java +++ b/src/com/android/settings/backup/BackupSettingsHelper.java @@ -26,13 +26,13 @@ import android.os.ServiceManager; import android.os.UserHandle; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.Settings.PrivacySettingsActivity; import java.net.URISyntaxException; -import androidx.annotation.VisibleForTesting; - /** * Helper class for {@link BackupSettingsActivity} that interacts with {@link IBackupManager}. */ diff --git a/src/com/android/settings/backup/BackupSettingsPreferenceController.java b/src/com/android/settings/backup/BackupSettingsPreferenceController.java index 49ee1e53167..2a657eabb9f 100644 --- a/src/com/android/settings/backup/BackupSettingsPreferenceController.java +++ b/src/com/android/settings/backup/BackupSettingsPreferenceController.java @@ -20,12 +20,12 @@ package com.android.settings.backup; import android.content.Context; import android.content.Intent; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.core.AbstractPreferenceController; + public class BackupSettingsPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { private static final String BACKUP_SETTINGS = "backup_settings"; diff --git a/src/com/android/settings/backup/ConfigureAccountPreferenceController.java b/src/com/android/settings/backup/ConfigureAccountPreferenceController.java index 6b80d7ce83d..553edc25fa4 100644 --- a/src/com/android/settings/backup/ConfigureAccountPreferenceController.java +++ b/src/com/android/settings/backup/ConfigureAccountPreferenceController.java @@ -19,11 +19,11 @@ package com.android.settings.backup; import android.content.Context; import android.content.Intent; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import androidx.preference.Preference; - public class ConfigureAccountPreferenceController extends BasePreferenceController { private PrivacySettingsConfigData mPSCD; diff --git a/src/com/android/settings/backup/DataManagementPreferenceController.java b/src/com/android/settings/backup/DataManagementPreferenceController.java index b69acfaa5e8..d19b8668a7a 100644 --- a/src/com/android/settings/backup/DataManagementPreferenceController.java +++ b/src/com/android/settings/backup/DataManagementPreferenceController.java @@ -18,10 +18,10 @@ package com.android.settings.backup; import android.content.Context; -import com.android.settings.core.BasePreferenceController; - import androidx.preference.Preference; +import com.android.settings.core.BasePreferenceController; + public class DataManagementPreferenceController extends BasePreferenceController { private PrivacySettingsConfigData mPSCD; diff --git a/src/com/android/settings/backup/ToggleBackupSettingFragment.java b/src/com/android/settings/backup/ToggleBackupSettingFragment.java index fb24542359f..70ab68ab4d4 100644 --- a/src/com/android/settings/backup/ToggleBackupSettingFragment.java +++ b/src/com/android/settings/backup/ToggleBackupSettingFragment.java @@ -12,6 +12,11 @@ import android.util.Log; import android.view.View; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -19,11 +24,6 @@ import com.android.settings.SettingsPreferenceFragment; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.ToggleSwitch; -import androidx.appcompat.app.AlertDialog; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.PreferenceViewHolder; - /** * Fragment to display a bunch of text about backup and restore, and allow the user to enable/ * disable it. diff --git a/src/com/android/settings/biometrics/BiometricEnrollBase.java b/src/com/android/settings/biometrics/BiometricEnrollBase.java index 130f20f7fe6..f5a1b5e6560 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollBase.java +++ b/src/com/android/settings/biometrics/BiometricEnrollBase.java @@ -16,8 +16,6 @@ package com.android.settings.biometrics; -import static android.app.Activity.RESULT_FIRST_USER; - import android.annotation.Nullable; import android.content.Intent; import android.content.res.Resources; diff --git a/src/com/android/settings/biometrics/BiometricErrorDialog.java b/src/com/android/settings/biometrics/BiometricErrorDialog.java index 6e5a221c829..d8cb123d85e 100644 --- a/src/com/android/settings/biometrics/BiometricErrorDialog.java +++ b/src/com/android/settings/biometrics/BiometricErrorDialog.java @@ -25,10 +25,10 @@ import android.content.DialogInterface; import android.hardware.biometrics.BiometricConstants; import android.os.Bundle; -import com.android.settings.core.instrumentation.InstrumentedDialogFragment; - import androidx.appcompat.app.AlertDialog; +import com.android.settings.core.instrumentation.InstrumentedDialogFragment; + /** * Abstract dialog, shown when an error occurs during biometric enrollment. */ diff --git a/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java b/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java index 4a52ef38be3..90d4cc2f1f9 100644 --- a/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java +++ b/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java @@ -21,13 +21,13 @@ import android.content.Intent; import android.os.UserHandle; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.Utils; import com.android.settings.core.BasePreferenceController; import com.android.settings.overlay.FeatureFactory; -import androidx.preference.Preference; - public abstract class BiometricStatusPreferenceController extends BasePreferenceController { protected final UserManager mUm; diff --git a/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java index 855b169538d..838dc0d9808 100644 --- a/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java @@ -19,14 +19,14 @@ package com.android.settings.biometrics.face; import android.content.Context; import android.content.Intent; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.utils.AnnotationSpan; import com.android.settingslib.HelpUtils; import com.android.settingslib.widget.FooterPreference; -import androidx.preference.Preference; - /** * Footer for face settings showing the help text and help link. */ diff --git a/src/com/android/settings/biometrics/face/FaceSettingsImprovePreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsImprovePreferenceController.java index 94b14b57b61..0d841dca21c 100644 --- a/src/com/android/settings/biometrics/face/FaceSettingsImprovePreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceSettingsImprovePreferenceController.java @@ -18,10 +18,10 @@ package com.android.settings.biometrics.face; import android.content.Context; -import com.android.settings.core.BasePreferenceController; - import androidx.preference.Preference; +import com.android.settings.core.BasePreferenceController; + /** * Preference controller which allows the user to update their enrolled face. */ diff --git a/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java index b1dcce02c26..d1fdc48f38c 100644 --- a/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java @@ -20,12 +20,12 @@ import android.content.Context; import android.view.View; import android.widget.Button; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.BasePreferenceController; -import androidx.preference.Preference; - /** * Controller for the remove button. */ diff --git a/src/com/android/settings/biometrics/face/FaceSettingsUnlockPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsUnlockPreferenceController.java index b483dc6c9c1..5c846461e24 100644 --- a/src/com/android/settings/biometrics/face/FaceSettingsUnlockPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceSettingsUnlockPreferenceController.java @@ -23,10 +23,10 @@ import android.content.Context; import android.os.UserHandle; import android.provider.Settings; -import com.android.settings.core.TogglePreferenceController; - import androidx.preference.Preference; +import com.android.settings.core.TogglePreferenceController; + /** * Preference controller for Face settings page controlling the ability to unlock the phone * with face. diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java index e6f3b04ae67..fb6a221de2e 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java @@ -39,6 +39,8 @@ import android.widget.Button; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.biometrics.BiometricEnrollSidecar; @@ -46,8 +48,6 @@ import com.android.settings.biometrics.BiometricErrorDialog; import com.android.settings.biometrics.BiometricsEnrollEnrolling; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import androidx.appcompat.app.AlertDialog; - /** * Activity which handles the actual enrolling for fingerprint. */ diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java index c104eb3de94..4b4f65a9b92 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java @@ -22,6 +22,8 @@ import android.os.Bundle; import android.view.View; import android.widget.Button; +import androidx.annotation.Nullable; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; @@ -29,8 +31,6 @@ import com.android.settings.biometrics.BiometricEnrollBase; import com.android.settings.biometrics.BiometricEnrollSidecar.Listener; import com.android.settings.password.ChooseLockSettingsHelper; -import androidx.annotation.Nullable; - /** * Activity explaining the fingerprint sensor location for fingerprint enrollment. */ diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java index c79ed49a2b1..1d8e7794ddd 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java @@ -29,10 +29,10 @@ import android.view.Surface; import android.view.TextureView; import android.view.View; -import com.android.settings.R; - import androidx.annotation.VisibleForTesting; +import com.android.settings.R; + /** * A view containing a VideoView for showing the user how to enroll a fingerprint */ diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java index 3309b78f98b..b7c55062d9c 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java @@ -37,6 +37,14 @@ import android.view.WindowManager; import android.widget.EditText; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -56,14 +64,6 @@ import com.android.settingslib.widget.FooterPreference; import java.util.HashMap; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; -import androidx.preference.PreferenceViewHolder; - /** * Settings screen for fingerprints */ diff --git a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java index febffa69dae..8ab92523095 100644 --- a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java +++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java @@ -23,6 +23,10 @@ import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.FragmentManager; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -30,10 +34,6 @@ import com.android.settings.SetupWizardUtils; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.password.ChooseLockSettingsHelper; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.FragmentManager; - public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSensor { @Override diff --git a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java index 7386c4ab029..ae759cd7700 100644 --- a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java @@ -20,12 +20,12 @@ import android.content.Context; import android.media.AudioManager; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; import com.android.settingslib.bluetooth.CachedBluetoothDevice; -import androidx.preference.Preference; - /** * Controller to maintain available media Bluetooth devices */ diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java index d7249b38210..09632df1554 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java @@ -18,14 +18,14 @@ package com.android.settings.bluetooth; import android.content.Context; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.widget.ActionButtonPreference; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.lifecycle.Lifecycle; -import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.PreferenceScreen; - /** * This class adds two buttons: one to connect/disconnect from a device (depending on the current * connected state), and one to "forget" (ie unpair) the device. diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsController.java index deb38fdc269..af5a6289afe 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsController.java @@ -18,6 +18,9 @@ package com.android.settings.bluetooth; import android.content.Context; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.AbstractPreferenceController; @@ -26,9 +29,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.PreferenceScreen; - /** * This class provides common lifecycle and bluetooth device event registration for Bluetooth device * details controllers. diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java index 3c10e6d8196..fb6cd56d534 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java @@ -20,6 +20,10 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.util.Pair; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.widget.EntityHeaderController; @@ -29,10 +33,6 @@ import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.core.lifecycle.Lifecycle; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.PreferenceScreen; - /** * This class adds a header with device name and status (connected/disconnected, etc.). */ diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java index b48a59f7afb..71a415de7fc 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java @@ -18,15 +18,15 @@ package com.android.settings.bluetooth; import android.content.Context; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.FooterPreferenceMixinCompat; -import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.PreferenceScreen; - /** * This class adds the device MAC address to a footer. */ diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java index 20e702a3eee..88cebcb331f 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java @@ -21,6 +21,13 @@ import android.bluetooth.BluetoothProfile; import android.content.Context; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settingslib.bluetooth.A2dpProfile; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothManager; @@ -33,13 +40,6 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - /** * This class adds switches for toggling the individual profiles that a Bluetooth device * supports, such as "Phone audio", "Media audio", "Contact sharing", etc. diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java index 719a61bf99c..df321118c1e 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java @@ -22,6 +22,8 @@ import android.bluetooth.BluetoothDevice; import android.content.Context; import android.os.Bundle; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.RestrictedDashboardFragment; @@ -33,8 +35,6 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; - public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment { public static final String KEY_DEVICE_ADDRESS = "device_address"; private static final String TAG = "BTDeviceDetailsFrg"; diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java index b9154f50a1d..129b2182389 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java @@ -25,16 +25,16 @@ import android.text.BidiFormatter; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * Controller that shows and updates the bluetooth device name */ diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java index eb1cd52ea38..5f71948854e 100644 --- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java +++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java @@ -30,6 +30,10 @@ import android.util.Pair; import android.util.TypedValue; import android.widget.ImageView; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; @@ -38,10 +42,6 @@ import com.android.settingslib.bluetooth.BluetoothUtils; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; -import androidx.appcompat.app.AlertDialog; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - /** * BluetoothDevicePreference is the preference type used to display each remote * Bluetooth device in the Bluetooth Settings screen. diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java index 24fcf6ae1e4..1d782b11f1d 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java @@ -16,18 +16,17 @@ package com.android.settings.bluetooth; -import android.bluetooth.BluetoothAdapter; import android.content.Context; import android.text.TextUtils; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.overlay.FeatureFactory; -import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; - import androidx.annotation.VisibleForTesting; import androidx.fragment.app.Fragment; import androidx.preference.Preference; +import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.overlay.FeatureFactory; +import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; + public class BluetoothDeviceRenamePreferenceController extends BluetoothDeviceNamePreferenceController { diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java index c786356eb46..297c90b2904 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java @@ -22,6 +22,9 @@ import android.os.Bundle; import android.os.SystemProperties; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.core.SubSettingLauncher; @@ -37,9 +40,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - /** * Update the bluetooth devices. It gets bluetooth event from {@link LocalBluetoothManager} using * {@link BluetoothCallback}. It notifies the upper level whether to add/remove the preference diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java index aec6d2d99af..0a9003d4e7d 100755 --- a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java +++ b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java @@ -26,11 +26,11 @@ import android.os.Handler; import android.os.SystemProperties; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver; -import androidx.preference.Preference; - /** * BluetoothDiscoverableEnabler is a helper to manage the "Discoverable" * checkbox. It sets/unsets discoverability and keeps track of how much time diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java index 9c00a50d4df..2da9eea4316 100644 --- a/src/com/android/settings/bluetooth/BluetoothEnabler.java +++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java @@ -25,14 +25,14 @@ import android.os.UserManager; import android.provider.Settings; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.widget.SwitchWidgetController; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.WirelessUtils; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; -import androidx.annotation.VisibleForTesting; - /** * BluetoothEnabler is a helper to manage the Bluetooth on/off checkbox * preference. It turns on/off Bluetooth and ensures the summary of the diff --git a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java index 73c02ab5afd..3f566f0373a 100644 --- a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java @@ -20,15 +20,15 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - /** * Controller that shows received files */ diff --git a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java index 6f737e015b2..260b4a81f49 100644 --- a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java @@ -34,11 +34,11 @@ import android.widget.Button; import android.widget.EditText; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; + import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import androidx.appcompat.app.AlertDialog; - /** * Dialog fragment for renaming a Bluetooth device. */ diff --git a/src/com/android/settings/bluetooth/BluetoothPairingController.java b/src/com/android/settings/bluetooth/BluetoothPairingController.java index 3c343c7cff4..c39f1d9feb0 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingController.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingController.java @@ -24,6 +24,8 @@ import android.util.Log; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.bluetooth.BluetoothPairingDialogFragment.BluetoothPairingDialogListener; import com.android.settingslib.bluetooth.LocalBluetoothManager; @@ -31,8 +33,6 @@ import com.android.settingslib.bluetooth.LocalBluetoothProfile; import java.util.Locale; -import androidx.annotation.VisibleForTesting; - /** * A controller used by {@link BluetoothPairingDialog} to manage connection state while we try to * pair with a bluetooth device. It includes methods that allow the diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java index 905327d54a8..94b41d65b5b 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java @@ -25,6 +25,8 @@ import android.os.Bundle; import android.util.Log; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.Indexable; @@ -32,8 +34,6 @@ import com.android.settingslib.bluetooth.BluetoothDeviceFilter; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.widget.FooterPreference; -import androidx.annotation.VisibleForTesting; - /** * BluetoothPairingDetail is a page to scan bluetooth devices and pair them. */ diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java index e5d2aa7b475..f8a2bbe9aef 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java @@ -34,13 +34,13 @@ import android.widget.CheckBox; import android.widget.EditText; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; - /** * A dialogFragment used by {@link BluetoothPairingDialog} to create an appropriately styled dialog * for the bluetooth device. diff --git a/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java index a8b545f4f1b..514c70fe749 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java @@ -18,14 +18,14 @@ package com.android.settings.bluetooth; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.SubSettingLauncher; import com.android.settings.dashboard.DashboardFragment; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; - /** * Controller that shows and updates the bluetooth device name diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java index 5f17e5f2ae6..de8902a8ffa 100644 --- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java +++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java @@ -28,6 +28,8 @@ import android.view.View; import android.widget.Button; import android.widget.TextView; +import androidx.preference.Preference; + import com.android.internal.app.AlertActivity; import com.android.internal.app.AlertController; import com.android.settings.R; @@ -35,8 +37,6 @@ import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.LocalBluetoothManager; -import androidx.preference.Preference; - /** * BluetoothPermissionActivity shows a dialog for accepting incoming * profile connection request from untrusted devices. diff --git a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java index 3c2f1b8964f..1462f917aa3 100644 --- a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java +++ b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java @@ -27,6 +27,12 @@ import android.content.IntentFilter; import android.net.Uri; import android.provider.SettingsSlicesContract; +import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.builders.ListBuilder; +import androidx.slice.builders.ListBuilder.RowBuilder; +import androidx.slice.builders.SliceAction; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SubSettings; @@ -34,12 +40,6 @@ import com.android.settings.connecteddevice.BluetoothDashboardFragment; import com.android.settings.slices.SliceBroadcastReceiver; import com.android.settings.slices.SliceBuilderUtils; -import androidx.core.graphics.drawable.IconCompat; -import androidx.slice.Slice; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.ListBuilder.RowBuilder; -import androidx.slice.builders.SliceAction; - /** * Utility class to build a Bluetooth Slice, and handle all associated actions. */ diff --git a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java index d577b0ad264..6e826492aed 100644 --- a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java +++ b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java @@ -21,6 +21,8 @@ import android.bluetooth.BluetoothDevice; import android.content.Context; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.widget.SummaryUpdater; import com.android.settingslib.bluetooth.BluetoothCallback; @@ -29,8 +31,6 @@ import com.android.settingslib.bluetooth.LocalBluetoothManager; import java.util.Set; -import androidx.annotation.VisibleForTesting; - /** * Helper class that listeners to bluetooth callback and notify client when there is update in * bluetooth summary info. diff --git a/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java index d828302876e..e0aa9e9c681 100644 --- a/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java @@ -18,6 +18,8 @@ package com.android.settings.bluetooth; import android.content.Context; import android.view.View; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -31,8 +33,6 @@ import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; import com.android.settingslib.widget.FooterPreference; -import androidx.annotation.VisibleForTesting; - /** * PreferenceController to update of bluetooth state. All behavior except managing the footer text * is delegated to the SwitchWidgetController it uses. diff --git a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java index 40ebfabe822..d2cfa43dc7b 100644 --- a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java @@ -21,12 +21,12 @@ import android.content.Context; import android.media.AudioManager; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; import com.android.settingslib.bluetooth.CachedBluetoothDevice; -import androidx.preference.Preference; - /** * Controller to maintain connected bluetooth devices */ diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java index 46d649ab405..820bf080256 100644 --- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java +++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java @@ -23,6 +23,11 @@ import android.os.SystemProperties; import android.text.BidiFormatter; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceGroup; + import com.android.settings.R; import com.android.settings.dashboard.RestrictedDashboardFragment; import com.android.settingslib.bluetooth.BluetoothCallback; @@ -33,11 +38,6 @@ import com.android.settingslib.bluetooth.LocalBluetoothManager; import java.util.Collection; import java.util.WeakHashMap; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceGroup; - /** * Parent class for settings fragments that contain a list of Bluetooth * devices. diff --git a/src/com/android/settings/bluetooth/DevicePickerActivity.java b/src/com/android/settings/bluetooth/DevicePickerActivity.java index 5228cd89ef2..77e8ba4e1c3 100644 --- a/src/com/android/settings/bluetooth/DevicePickerActivity.java +++ b/src/com/android/settings/bluetooth/DevicePickerActivity.java @@ -18,10 +18,10 @@ package com.android.settings.bluetooth; import android.os.Bundle; -import com.android.settings.R; - import androidx.fragment.app.FragmentActivity; +import com.android.settings.R; + /** * Activity for Bluetooth device picker dialog. The device picker logic * is implemented in the {@link BluetoothPairingDetail} fragment. diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java index 097fba7ac81..38936f50ca7 100644 --- a/src/com/android/settings/bluetooth/DevicePickerFragment.java +++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java @@ -28,6 +28,8 @@ import android.os.UserManager; import android.view.Menu; import android.view.MenuInflater; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settingslib.bluetooth.CachedBluetoothDevice; @@ -35,8 +37,6 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.List; -import androidx.annotation.VisibleForTesting; - /** * BluetoothSettings is the Settings screen for Bluetooth configuration and * connection management. diff --git a/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java b/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java index e6606915b30..33e2ab39a20 100644 --- a/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java +++ b/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java @@ -23,15 +23,15 @@ import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothManager; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; - /** Implements an AlertDialog for confirming that a user wishes to unpair or "forget" a paired * device*/ public class ForgetDeviceDialogFragment extends InstrumentedDialogFragment { diff --git a/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java b/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java index 44e3a91f20b..7894ed6d5fe 100644 --- a/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java +++ b/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java @@ -20,13 +20,13 @@ import android.bluetooth.BluetoothDevice; import android.content.Context; import android.os.Bundle; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothManager; -import androidx.annotation.VisibleForTesting; - /** Provides a dialog for changing the display name of a remote bluetooth device. */ public class RemoteDeviceNameDialogFragment extends BluetoothNameDialogFragment { public static final String TAG = "RemoteDeviceName"; diff --git a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java index 50de166ba65..8c6d3f26704 100644 --- a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java @@ -19,12 +19,12 @@ import android.bluetooth.BluetoothDevice; import android.content.Context; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; import com.android.settingslib.bluetooth.CachedBluetoothDevice; -import androidx.preference.Preference; - /** * Maintain and update saved bluetooth devices(bonded but not connected) */ diff --git a/src/com/android/settings/bluetooth/Utils.java b/src/com/android/settings/bluetooth/Utils.java index 567aa93d397..fd6bbc34cae 100755 --- a/src/com/android/settings/bluetooth/Utils.java +++ b/src/com/android/settings/bluetooth/Utils.java @@ -24,6 +24,9 @@ import android.provider.Settings; import android.util.Log; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; @@ -32,9 +35,6 @@ import com.android.settingslib.bluetooth.BluetoothUtils.ErrorListener; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothManager.BluetoothManagerCallback; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; - /** * Utils is a helper class that contains constants for various * Android resource IDs, debug logging flags, and static methods diff --git a/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java b/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java index 2849d714871..3239dd5b32f 100644 --- a/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java +++ b/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java @@ -22,15 +22,15 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * Controller to maintain the {@link androidx.preference.Preference} for add * device. It monitor Bluetooth's status(on/off) and decide if need to show summary or not. diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java index de6548dd415..26c3e345558 100644 --- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java +++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java @@ -18,12 +18,12 @@ package com.android.settings.connecteddevice; import android.content.Context; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.nfc.NfcPreferenceController; -import androidx.annotation.VisibleForTesting; - /** * Controller that used to show which component is available */ diff --git a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java index e0a7d279381..2681288bc97 100644 --- a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java +++ b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java @@ -21,6 +21,11 @@ import android.content.Context; import android.content.pm.PackageManager; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.bluetooth.AvailableMediaBluetoothDeviceUpdater; import com.android.settings.bluetooth.BluetoothDeviceUpdater; @@ -33,11 +38,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - /** * Controller to maintain the {@link androidx.preference.PreferenceGroup} for all * available media devices. It uses {@link DevicePreferenceCallback} diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java index e986bc2f5ec..daa99326a13 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java @@ -18,6 +18,11 @@ package com.android.settings.connecteddevice; import android.content.Context; import android.content.pm.PackageManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater; import com.android.settings.connecteddevice.dock.DockUpdater; @@ -31,11 +36,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - /** * Controller to maintain the {@link androidx.preference.PreferenceGroup} for all * connected devices. It uses {@link DevicePreferenceCallback} to add/remove {@link Preference} diff --git a/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java b/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java index feb64b5f101..ead33070ee0 100644 --- a/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java +++ b/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java @@ -25,6 +25,9 @@ import android.content.pm.PackageManager; import android.text.BidiFormatter; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.bluetooth.AlwaysDiscoverable; import com.android.settings.bluetooth.Utils; @@ -37,9 +40,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.FooterPreferenceMixinCompat; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceScreen; - /** * Controller that shows and updates the bluetooth device name */ diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java index eff97c3c900..5f6ffb24eec 100644 --- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java +++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java @@ -18,6 +18,10 @@ package com.android.settings.connecteddevice; import android.content.Context; import android.content.pm.PackageManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater; import com.android.settings.connecteddevice.dock.DockUpdater; @@ -28,10 +32,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class PreviouslyConnectedDevicePreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart, OnStop, DevicePreferenceCallback { diff --git a/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java b/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java index c85713522d4..951f3d1751b 100644 --- a/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java +++ b/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java @@ -18,6 +18,11 @@ package com.android.settings.connecteddevice; import android.content.Context; import android.content.pm.PackageManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater; import com.android.settings.connecteddevice.dock.DockUpdater; @@ -30,11 +35,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - /** * Controller to maintain the {@link PreferenceGroup} for all * saved devices. It uses {@link DevicePreferenceCallback} to add/remove {@link Preference} diff --git a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java index df5a8fb5213..befdf29f378 100644 --- a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java +++ b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java @@ -19,14 +19,14 @@ import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.core.SubSettingLauncher; import com.android.settings.dashboard.DashboardFragment; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - /** * Controller to maintain connected usb device */ diff --git a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java index 471486b0918..476f1051790 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java @@ -20,6 +20,8 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.os.Bundle; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; @@ -32,8 +34,6 @@ import com.google.android.collect.Lists; import java.util.List; -import androidx.annotation.VisibleForTesting; - /** * Provides options for selecting the default USB mode. */ diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java index bd0cd8aeca2..1219211a3ab 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java @@ -19,12 +19,12 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.os.Handler; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; - import androidx.annotation.UiThread; import androidx.annotation.VisibleForTesting; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.core.AbstractPreferenceController; + /** * This class provides common members and refresh functionality for usb controllers. */ diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java index e1ffac98330..84576b14252 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java @@ -19,13 +19,13 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.hardware.usb.UsbPort; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.widget.RadioButtonPreference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - /** * This class controls the radio buttons for switching between * USB device and host mode. diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java index f5c3f53cc40..4b717e05596 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java @@ -20,6 +20,8 @@ import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; @@ -33,8 +35,6 @@ import com.google.android.collect.Lists; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; - /** * Controls the USB device details and provides updates to individual controllers. */ diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java index 4bdb60b1d37..e30237dd37b 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java @@ -20,6 +20,9 @@ import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.widget.RadioButtonPreference; @@ -27,9 +30,6 @@ import com.android.settings.widget.RadioButtonPreference; import java.util.LinkedHashMap; import java.util.Map; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - /** * This class controls the radio buttons for choosing between different USB functions. */ diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java index a6648125017..0e1811d70ed 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java @@ -18,12 +18,12 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.widget.EntityHeaderController; -import androidx.preference.PreferenceScreen; - /** * This class adds a header with device name. */ diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java index c6efd194564..30314f6e2ca 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java @@ -19,15 +19,15 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.hardware.usb.UsbPort; -import com.android.settings.R; -import com.android.settings.Utils; - import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import com.android.settings.R; +import com.android.settings.Utils; + /** * This class controls the switch for changing USB power direction. */ diff --git a/src/com/android/settings/core/BasePreferenceController.java b/src/com/android/settings/core/BasePreferenceController.java index 14b8a811de8..facec4ace81 100644 --- a/src/com/android/settings/core/BasePreferenceController.java +++ b/src/com/android/settings/core/BasePreferenceController.java @@ -19,6 +19,9 @@ import android.content.IntentFilter; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.search.SearchIndexableRaw; import com.android.settings.slices.SliceData; import com.android.settingslib.core.AbstractPreferenceController; @@ -29,9 +32,6 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * Abstract class to consolidate utility between preference controllers and act as an interface * for Slices. The abstract classes that inherit from this class will act as the direct interfaces diff --git a/src/com/android/settings/core/InstrumentedPreferenceFragment.java b/src/com/android/settings/core/InstrumentedPreferenceFragment.java index 2bcf89584f6..cafef00cf6f 100644 --- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java +++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java @@ -21,6 +21,9 @@ import android.os.Bundle; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.XmlRes; +import androidx.preference.PreferenceScreen; + import com.android.settings.overlay.FeatureFactory; import com.android.settings.survey.SurveyMixin; import com.android.settingslib.core.instrumentation.Instrumentable; @@ -28,9 +31,6 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin; import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment; -import androidx.annotation.XmlRes; -import androidx.preference.PreferenceScreen; - /** * Instrumented fragment that logs visibility state. */ diff --git a/src/com/android/settings/core/SliderPreferenceController.java b/src/com/android/settings/core/SliderPreferenceController.java index 8cae29a5915..0ea6be30738 100644 --- a/src/com/android/settings/core/SliderPreferenceController.java +++ b/src/com/android/settings/core/SliderPreferenceController.java @@ -16,10 +16,10 @@ package com.android.settings.core; import android.content.Context; -import com.android.settings.slices.SliceData; - import androidx.preference.Preference; +import com.android.settings.slices.SliceData; + public abstract class SliderPreferenceController extends BasePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/core/SubSettingLauncher.java b/src/com/android/settings/core/SubSettingLauncher.java index f3f37485b5c..1df6bb98fe4 100644 --- a/src/com/android/settings/core/SubSettingLauncher.java +++ b/src/com/android/settings/core/SubSettingLauncher.java @@ -23,13 +23,13 @@ import android.os.Bundle; import android.os.UserHandle; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; + import com.android.settings.SettingsActivity; import com.android.settings.SubSettings; import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin; -import androidx.annotation.VisibleForTesting; -import androidx.fragment.app.Fragment; - public class SubSettingLauncher { private final Context mContext; diff --git a/src/com/android/settings/core/TogglePreferenceController.java b/src/com/android/settings/core/TogglePreferenceController.java index 6c9df2a628a..165d7eb1305 100644 --- a/src/com/android/settings/core/TogglePreferenceController.java +++ b/src/com/android/settings/core/TogglePreferenceController.java @@ -15,12 +15,12 @@ package com.android.settings.core; import android.content.Context; -import com.android.settings.slices.SliceData; -import com.android.settings.widget.MasterSwitchPreference; - import androidx.preference.Preference; import androidx.preference.TwoStatePreference; +import com.android.settings.slices.SliceData; +import com.android.settings.widget.MasterSwitchPreference; + /** * Abstract class that consolidates logic for updating toggle controllers. * It automatically handles the getting and setting of the switch UI element. diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java index f5330a7b5eb..9df4a05bac9 100644 --- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java +++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java @@ -30,7 +30,6 @@ import com.android.settings.deviceinfo.StorageDashboardFragment; import com.android.settings.display.NightDisplaySettings; import com.android.settings.fuelgauge.PowerUsageSummary; import com.android.settings.gestures.GestureSettings; -import com.android.settings.homepage.TopLevelSettings; import com.android.settings.language.LanguageAndInputSettings; import com.android.settings.network.NetworkDashboardFragment; import com.android.settings.notification.ConfigureNotificationSettings; diff --git a/src/com/android/settings/dashboard/DashboardItemAnimator.java b/src/com/android/settings/dashboard/DashboardItemAnimator.java index 332e915b9e2..51dd49eea3e 100644 --- a/src/com/android/settings/dashboard/DashboardItemAnimator.java +++ b/src/com/android/settings/dashboard/DashboardItemAnimator.java @@ -15,12 +15,12 @@ */ package com.android.settings.dashboard; -import com.android.settingslib.drawer.Tile; - import androidx.core.view.ViewCompat; import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.RecyclerView.ViewHolder; +import com.android.settingslib.drawer.Tile; + public class DashboardItemAnimator extends DefaultItemAnimator { @Override diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java index 4575482f2d6..9139695b3b9 100644 --- a/src/com/android/settings/dashboard/DashboardSummary.java +++ b/src/com/android/settings/dashboard/DashboardSummary.java @@ -38,9 +38,9 @@ import com.android.settings.core.SettingsBaseActivity; import com.android.settings.core.SettingsBaseActivity.CategoryListener; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; import com.android.settings.homepage.conditional.ConditionListener; +import com.android.settings.homepage.conditional.ConditionManager; import com.android.settings.homepage.conditional.FocusRecyclerView; import com.android.settings.homepage.conditional.FocusRecyclerView.FocusListener; -import com.android.settings.homepage.conditional.ConditionManager; import com.android.settings.overlay.FeatureFactory; import com.android.settings.widget.ActionBarShadowController; import com.android.settingslib.drawer.CategoryKey; diff --git a/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java b/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java index 8bae1513640..fc26e5521cd 100644 --- a/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java +++ b/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java @@ -18,12 +18,12 @@ package com.android.settings.dashboard; import android.content.Context; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.core.AbstractPreferenceController; + /** * PreferenceController for a dashboard_tile_placeholder, a special preference marking where * dynamic dashboard tiles should be injected in a screen. It is optional when building diff --git a/src/com/android/settings/dashboard/RestrictedDashboardFragment.java b/src/com/android/settings/dashboard/RestrictedDashboardFragment.java index 927385b4eaa..ab4127a46b5 100644 --- a/src/com/android/settings/dashboard/RestrictedDashboardFragment.java +++ b/src/com/android/settings/dashboard/RestrictedDashboardFragment.java @@ -31,13 +31,13 @@ import android.os.UserManager; import android.view.View; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; + import com.android.settings.R; import com.android.settings.RestrictedSettingsFragment; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settingslib.RestrictedLockUtils; -import androidx.appcompat.app.AlertDialog; - /** * Base class for settings screens that should be pin protected when in restricted mode or * that will display an admin support message in case an admin has disabled the options. diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java index 95d150283a9..a210c8518f5 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java @@ -32,6 +32,9 @@ import android.view.ViewGroup; import android.view.WindowManager; import android.widget.LinearLayout; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardAdapter.DashboardItemHolder; @@ -48,9 +51,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.RecyclerView; - public class SuggestionAdapter extends RecyclerView.Adapter implements LifecycleObserver, OnSaveInstanceState { public static final String TAG = "SuggestionAdapter"; diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java index 4b47dfdfea4..8547db0ff03 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java @@ -27,10 +27,10 @@ import android.net.Uri; import android.os.Bundle; import android.util.Log; -import com.android.settings.overlay.FeatureFactory; - import androidx.annotation.VisibleForTesting; +import com.android.settings.overlay.FeatureFactory; + public class SuggestionStateProvider extends ContentProvider { private static final String TAG = "SugstStatusProvider"; diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java index ed1920ce7ed..ff89a11bb07 100644 --- a/src/com/android/settings/datausage/AppDataUsage.java +++ b/src/com/android/settings/datausage/AppDataUsage.java @@ -36,6 +36,12 @@ import android.util.Log; import android.view.View; import android.widget.AdapterView; +import androidx.annotation.VisibleForTesting; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppInfoBase; @@ -49,12 +55,6 @@ import com.android.settingslib.net.ChartDataLoaderCompat; import com.android.settingslib.net.UidDetail; import com.android.settingslib.net.UidDetailProvider; -import androidx.annotation.VisibleForTesting; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.Loader; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; - public class AppDataUsage extends DataUsageBase implements Preference.OnPreferenceChangeListener, DataSaverBackend.Listener { diff --git a/src/com/android/settings/datausage/AppDataUsagePreference.java b/src/com/android/settings/datausage/AppDataUsagePreference.java index a8168c4a7d1..0eab5ab936b 100644 --- a/src/com/android/settings/datausage/AppDataUsagePreference.java +++ b/src/com/android/settings/datausage/AppDataUsagePreference.java @@ -18,14 +18,14 @@ import android.content.Context; import android.view.View; import android.widget.ProgressBar; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.widget.AppPreference; import com.android.settingslib.AppItem; import com.android.settingslib.net.UidDetail; import com.android.settingslib.net.UidDetailProvider; import com.android.settingslib.utils.ThreadUtils; -import androidx.preference.PreferenceViewHolder; - public class AppDataUsagePreference extends AppPreference { private final AppItem mItem; diff --git a/src/com/android/settings/datausage/AppPrefLoader.java b/src/com/android/settings/datausage/AppPrefLoader.java index 501d14242f3..1e0a55434f1 100644 --- a/src/com/android/settings/datausage/AppPrefLoader.java +++ b/src/com/android/settings/datausage/AppPrefLoader.java @@ -21,10 +21,10 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.util.ArraySet; -import com.android.settingslib.utils.AsyncLoaderCompat; - import androidx.preference.Preference; +import com.android.settingslib.utils.AsyncLoaderCompat; + public class AppPrefLoader extends AsyncLoaderCompat> { private ArraySet mPackages; private PackageManager mPackageManager; diff --git a/src/com/android/settings/datausage/BillingCyclePreference.java b/src/com/android/settings/datausage/BillingCyclePreference.java index 70a123f9aa6..b30f32e0ff0 100644 --- a/src/com/android/settings/datausage/BillingCyclePreference.java +++ b/src/com/android/settings/datausage/BillingCyclePreference.java @@ -21,13 +21,13 @@ import android.os.Bundle; import android.os.RemoteException; import android.util.AttributeSet; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settings.datausage.CellDataPreference.DataStateListener; -import androidx.preference.Preference; - public class BillingCyclePreference extends Preference implements TemplatePreference { private NetworkTemplate mTemplate; diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java index 1d1ec6d4f3d..de715723249 100644 --- a/src/com/android/settings/datausage/BillingCycleSettings.java +++ b/src/com/android/settings/datausage/BillingCycleSettings.java @@ -33,6 +33,12 @@ import android.widget.EditText; import android.widget.NumberPicker; import android.widget.Spinner; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -45,12 +51,6 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - @SearchIndexable public class BillingCycleSettings extends DataUsageBase implements Preference.OnPreferenceChangeListener, DataUsageEditController { diff --git a/src/com/android/settings/datausage/CellDataPreference.java b/src/com/android/settings/datausage/CellDataPreference.java index e46a235d985..48e408992ab 100644 --- a/src/com/android/settings/datausage/CellDataPreference.java +++ b/src/com/android/settings/datausage/CellDataPreference.java @@ -32,6 +32,11 @@ import android.util.Log; import android.view.View; import android.widget.Checkable; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog.Builder; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; @@ -40,11 +45,6 @@ import com.android.settingslib.CustomDialogPreferenceCompat; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog.Builder; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.PreferenceViewHolder; - public class CellDataPreference extends CustomDialogPreferenceCompat implements TemplatePreference { private static final String TAG = "CellDataPreference"; diff --git a/src/com/android/settings/datausage/ChartDataUsagePreference.java b/src/com/android/settings/datausage/ChartDataUsagePreference.java index 92d5cc80110..72a1094d64e 100644 --- a/src/com/android/settings/datausage/ChartDataUsagePreference.java +++ b/src/com/android/settings/datausage/ChartDataUsagePreference.java @@ -25,14 +25,14 @@ import android.text.style.ForegroundColorSpan; import android.util.AttributeSet; import android.util.SparseIntArray; -import com.android.settings.R; -import com.android.settings.Utils; -import com.android.settings.widget.UsageView; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; +import com.android.settings.Utils; +import com.android.settings.widget.UsageView; + public class ChartDataUsagePreference extends Preference { // The resolution we show on the graph so that we can squash things down to ints. diff --git a/src/com/android/settings/datausage/DataSaverPreference.java b/src/com/android/settings/datausage/DataSaverPreference.java index 80a60426b58..79e4c130a0a 100644 --- a/src/com/android/settings/datausage/DataSaverPreference.java +++ b/src/com/android/settings/datausage/DataSaverPreference.java @@ -17,10 +17,10 @@ package com.android.settings.datausage; import android.content.Context; import android.util.AttributeSet; -import com.android.settings.R; - import androidx.preference.Preference; +import com.android.settings.R; + public class DataSaverPreference extends Preference implements DataSaverBackend.Listener { private final DataSaverBackend mDataSaverBackend; diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java index 24e8740ad70..f4013424ddd 100644 --- a/src/com/android/settings/datausage/DataSaverSummary.java +++ b/src/com/android/settings/datausage/DataSaverSummary.java @@ -21,6 +21,8 @@ import android.provider.SearchIndexableResource; import android.telephony.SubscriptionManager; import android.widget.Switch; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -40,8 +42,6 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; - @SearchIndexable public class DataSaverSummary extends SettingsPreferenceFragment implements OnSwitchChangeListener, Listener, Callback, Callbacks { diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java index 0c9c7f99330..755eee3515e 100644 --- a/src/com/android/settings/datausage/DataUsageList.java +++ b/src/com/android/settings/datausage/DataUsageList.java @@ -51,6 +51,12 @@ import android.widget.AdapterView.OnItemSelectedListener; import android.widget.ImageView; import android.widget.Spinner; +import androidx.annotation.VisibleForTesting; +import androidx.loader.app.LoaderManager.LoaderCallbacks; +import androidx.loader.content.Loader; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; @@ -66,12 +72,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.loader.app.LoaderManager.LoaderCallbacks; -import androidx.loader.content.Loader; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; - /** * Panel showing data usage history across various networks, including options * to inspect based on usage cycle and control through {@link NetworkPolicy}. diff --git a/src/com/android/settings/datausage/DataUsagePreference.java b/src/com/android/settings/datausage/DataUsagePreference.java index 1658c46f880..fd5c44ebe82 100644 --- a/src/com/android/settings/datausage/DataUsagePreference.java +++ b/src/com/android/settings/datausage/DataUsagePreference.java @@ -21,15 +21,15 @@ import android.net.NetworkTemplate; import android.os.Bundle; import android.util.AttributeSet; +import androidx.annotation.VisibleForTesting; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settingslib.net.DataUsageController; -import androidx.annotation.VisibleForTesting; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.Preference; - public class DataUsagePreference extends Preference implements TemplatePreference { private NetworkTemplate mTemplate; diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java index d8f8f02e1a0..c7c906ffb95 100644 --- a/src/com/android/settings/datausage/DataUsageSummary.java +++ b/src/com/android/settings/datausage/DataUsageSummary.java @@ -29,6 +29,10 @@ import android.text.TextUtils; import android.text.format.Formatter; import android.text.style.RelativeSizeSpan; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; @@ -43,10 +47,6 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * Settings preference fragment that displays data usage summary. */ diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java index 87445604ebb..5b54ebb7878 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java @@ -33,6 +33,10 @@ import android.widget.Button; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; @@ -43,10 +47,6 @@ import com.android.settingslib.utils.StringUtil; import java.util.Objects; import java.util.concurrent.TimeUnit; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - /** * Provides a summary of data usage. */ diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java index 8cbd82d4796..d5707c4ac6f 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java @@ -29,6 +29,10 @@ import android.text.format.Formatter; import android.util.Log; import android.util.RecurrenceRule; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.util.CollectionUtils; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; @@ -42,10 +46,6 @@ import com.android.settingslib.net.DataUsageController; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.recyclerview.widget.RecyclerView; - /** * This is the controller for the top of the data usage screen that retrieves carrier data from the * new subscriptions framework API if available. The controller reads subscription information from diff --git a/src/com/android/settings/datausage/SpinnerPreference.java b/src/com/android/settings/datausage/SpinnerPreference.java index 15a07dc8c70..867930baa97 100644 --- a/src/com/android/settings/datausage/SpinnerPreference.java +++ b/src/com/android/settings/datausage/SpinnerPreference.java @@ -20,11 +20,11 @@ import android.view.View; import android.widget.AdapterView; import android.widget.Spinner; -import com.android.settings.R; - import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; + public class SpinnerPreference extends Preference implements CycleAdapter.SpinnerInterface { private CycleAdapter mAdapter; diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java b/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java index 0c462db9558..2fefe016f76 100644 --- a/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java +++ b/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java @@ -19,6 +19,8 @@ import android.content.Context; import android.os.UserHandle; import android.view.View; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; import com.android.settings.dashboard.DashboardFragment; @@ -28,8 +30,6 @@ import com.android.settingslib.RestrictedPreferenceHelper; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; -import androidx.preference.PreferenceViewHolder; - public class UnrestrictedDataAccessPreference extends AppSwitchPreference implements DataSaverBackend.Listener { diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java index d686d9875fb..e47c7f870b7 100644 --- a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java +++ b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java @@ -19,6 +19,10 @@ import android.app.Application; import android.content.Context; import android.os.UserHandle; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppStateBaseBridge; @@ -38,10 +42,6 @@ import java.util.ArrayList; import java.util.Set; import java.util.TreeSet; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class UnrestrictedDataAccessPreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart, OnStop, OnDestroy, ApplicationsState.Callbacks, diff --git a/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java b/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java index f191a134077..7b7e0640666 100644 --- a/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java @@ -22,15 +22,15 @@ import android.provider.Settings.System; import android.text.TextUtils; import android.text.format.DateFormat; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import java.util.Locale; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; -import androidx.preference.TwoStatePreference; - public class AutoTimeFormatPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/datetime/AutoTimePreferenceController.java b/src/com/android/settings/datetime/AutoTimePreferenceController.java index a5da34a9ca9..3916ef27316 100644 --- a/src/com/android/settings/datetime/AutoTimePreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimePreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.datetime; import android.content.Context; import android.provider.Settings; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; - public class AutoTimePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java index a0355b2f355..4426bde99f4 100644 --- a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.datetime; import android.content.Context; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.Utils; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - public class AutoTimeZonePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/datetime/DatePreferenceController.java b/src/com/android/settings/datetime/DatePreferenceController.java index ceb65ca8520..1704bd6febd 100644 --- a/src/com/android/settings/datetime/DatePreferenceController.java +++ b/src/com/android/settings/datetime/DatePreferenceController.java @@ -24,15 +24,15 @@ import android.text.TextUtils; import android.text.format.DateFormat; import android.widget.DatePicker; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.AbstractPreferenceController; import java.util.Calendar; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - public class DatePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, DatePickerDialog.OnDateSetListener { diff --git a/src/com/android/settings/datetime/TimeFormatPreferenceController.java b/src/com/android/settings/datetime/TimeFormatPreferenceController.java index 25af357bcde..3ad879a279a 100644 --- a/src/com/android/settings/datetime/TimeFormatPreferenceController.java +++ b/src/com/android/settings/datetime/TimeFormatPreferenceController.java @@ -22,16 +22,16 @@ import android.provider.Settings; import android.text.TextUtils; import android.text.format.DateFormat; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import java.util.Calendar; import java.util.Date; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; -import androidx.preference.TwoStatePreference; - public class TimeFormatPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/datetime/TimePreferenceController.java b/src/com/android/settings/datetime/TimePreferenceController.java index 8bb292c694c..3ca26bc8a74 100644 --- a/src/com/android/settings/datetime/TimePreferenceController.java +++ b/src/com/android/settings/datetime/TimePreferenceController.java @@ -24,14 +24,14 @@ import android.text.TextUtils; import android.text.format.DateFormat; import android.widget.TimePicker; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.AbstractPreferenceController; import java.util.Calendar; -import androidx.preference.Preference; - public class TimePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, TimePickerDialog.OnTimeSetListener { diff --git a/src/com/android/settings/datetime/TimeZonePreferenceController.java b/src/com/android/settings/datetime/TimeZonePreferenceController.java index 76c2455f1fd..a19f0559216 100644 --- a/src/com/android/settings/datetime/TimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/TimeZonePreferenceController.java @@ -18,6 +18,9 @@ package com.android.settings.datetime; import android.content.Context; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.AbstractPreferenceController; @@ -25,9 +28,6 @@ import com.android.settingslib.datetime.ZoneGetter; import java.util.Calendar; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - public class TimeZonePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java b/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java index a06768718a9..ff980b2ceca 100644 --- a/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java +++ b/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java @@ -24,6 +24,12 @@ import android.view.ViewGroup; import android.widget.Filter; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; +import androidx.annotation.WorkerThread; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.datetime.timezone.BaseTimeZonePicker.OnListItemClickListener; @@ -31,12 +37,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; -import androidx.annotation.WorkerThread; -import androidx.recyclerview.widget.RecyclerView; - /** * Used with {@class BaseTimeZonePicker}. It renders text in each item into list view. A list of * {@class AdapterItem} must be provided when an instance is created. diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java b/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java index fa0be2ea2c9..1ed851674ea 100644 --- a/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java +++ b/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java @@ -24,6 +24,8 @@ import android.icu.text.DateFormat; import android.icu.text.SimpleDateFormat; import android.icu.util.Calendar; +import androidx.annotation.Nullable; + import com.android.settings.R; import com.android.settings.datetime.timezone.model.TimeZoneData; @@ -32,8 +34,6 @@ import java.util.Date; import java.util.List; import java.util.Locale; -import androidx.annotation.Nullable; - /** * Render a list of {@class TimeZoneInfo} into the list view in {@class BaseTimeZonePicker} */ diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java b/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java index 5e1471b7d63..887b9f2af99 100644 --- a/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java +++ b/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java @@ -27,6 +27,9 @@ import android.widget.LinearLayout; import android.widget.SearchView; import android.widget.TextView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.core.InstrumentedFragment; import com.android.settings.datetime.timezone.model.TimeZoneData; @@ -34,9 +37,6 @@ import com.android.settings.datetime.timezone.model.TimeZoneDataLoader; import java.util.Locale; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - /** * It's abstract class. Subclass should use it with {@class BaseTimeZoneAdapter} and * {@class AdapterItem} to provide a list view with text search capability. diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java b/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java index 89b68cbc73b..8a0d73708ca 100644 --- a/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java @@ -18,12 +18,12 @@ package com.android.settings.datetime.timezone; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.core.BasePreferenceController; import com.google.common.base.Objects; -import androidx.preference.Preference; - public abstract class BaseTimeZonePreferenceController extends BasePreferenceController { private OnPreferenceClickListener mOnClickListener; diff --git a/src/com/android/settings/datetime/timezone/RegionSearchPicker.java b/src/com/android/settings/datetime/timezone/RegionSearchPicker.java index ea4c7ee4413..0abf4e49a54 100644 --- a/src/com/android/settings/datetime/timezone/RegionSearchPicker.java +++ b/src/com/android/settings/datetime/timezone/RegionSearchPicker.java @@ -23,6 +23,8 @@ import android.icu.text.LocaleDisplayNames; import android.os.Bundle; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; @@ -36,8 +38,6 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; -import androidx.annotation.VisibleForTesting; - /** * Render a list of regions into a list view. */ diff --git a/src/com/android/settings/datetime/timezone/RegionZonePicker.java b/src/com/android/settings/datetime/timezone/RegionZonePicker.java index ea8d3280eb9..83d71f1c8d2 100644 --- a/src/com/android/settings/datetime/timezone/RegionZonePicker.java +++ b/src/com/android/settings/datetime/timezone/RegionZonePicker.java @@ -23,6 +23,9 @@ import android.icu.util.TimeZone; import android.os.Bundle; import android.util.Log; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.datetime.timezone.model.FilteredCountryTimeZones; @@ -36,9 +39,6 @@ import java.util.Date; import java.util.List; import java.util.TreeSet; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; - /** * Given a region, render a list of time zone {@class TimeZoneInfo} into a list view. */ diff --git a/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java b/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java index 8d08c6ba1d8..a297ce60851 100644 --- a/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java +++ b/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java @@ -18,10 +18,10 @@ package com.android.settings.datetime.timezone; import android.content.Context; -import com.android.settings.R; - import androidx.preference.Preference; +import com.android.settings.R; + public class RegionZonePreferenceController extends BaseTimeZonePreferenceController { private static final String PREFERENCE_KEY = "region_zone"; diff --git a/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java index 95448296719..233111aa2f1 100644 --- a/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java +++ b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java @@ -25,14 +25,14 @@ import android.icu.util.Calendar; import android.icu.util.TimeZone; import android.icu.util.TimeZoneTransition; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settingslib.widget.FooterPreference; import java.util.Date; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - public class TimeZoneInfoPreferenceController extends BaseTimeZonePreferenceController { private static final String PREFERENCE_KEY = FooterPreference.KEY_FOOTER; diff --git a/src/com/android/settings/datetime/timezone/TimeZoneSettings.java b/src/com/android/settings/datetime/timezone/TimeZoneSettings.java index 23b09f5232d..a20cdb5d41e 100644 --- a/src/com/android/settings/datetime/timezone/TimeZoneSettings.java +++ b/src/com/android/settings/datetime/timezone/TimeZoneSettings.java @@ -28,6 +28,9 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceCategory; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; @@ -44,9 +47,6 @@ import java.util.Locale; import java.util.Objects; import java.util.Set; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceCategory; - /** * The class displays a time zone picker either by regions or fixed offset time zones. */ diff --git a/src/com/android/settings/datetime/timezone/model/TimeZoneData.java b/src/com/android/settings/datetime/timezone/model/TimeZoneData.java index b7ba66d667c..c9148450691 100644 --- a/src/com/android/settings/datetime/timezone/model/TimeZoneData.java +++ b/src/com/android/settings/datetime/timezone/model/TimeZoneData.java @@ -15,6 +15,9 @@ */ package com.android.settings.datetime.timezone.model; +import androidx.annotation.VisibleForTesting; +import androidx.collection.ArraySet; + import libcore.util.CountryTimeZones; import libcore.util.CountryZonesFinder; import libcore.util.TimeZoneFinder; @@ -26,9 +29,6 @@ import java.util.List; import java.util.Locale; import java.util.Set; -import androidx.annotation.VisibleForTesting; -import androidx.collection.ArraySet; - /** * Wrapper of CountryZonesFinder to normalize the country code and only show the regions that are * has time zone shown in the time zone picker. diff --git a/src/com/android/settings/datetime/timezone/model/TimeZoneDataLoader.java b/src/com/android/settings/datetime/timezone/model/TimeZoneDataLoader.java index 7ca157e29a4..e9018332603 100644 --- a/src/com/android/settings/datetime/timezone/model/TimeZoneDataLoader.java +++ b/src/com/android/settings/datetime/timezone/model/TimeZoneDataLoader.java @@ -19,11 +19,11 @@ package com.android.settings.datetime.timezone.model; import android.content.Context; import android.os.Bundle; -import com.android.settingslib.utils.AsyncLoaderCompat; - import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; +import com.android.settingslib.utils.AsyncLoaderCompat; + public class TimeZoneDataLoader extends AsyncLoaderCompat { public TimeZoneDataLoader(Context context) { diff --git a/src/com/android/settings/deletionhelper/ActivationWarningFragment.java b/src/com/android/settings/deletionhelper/ActivationWarningFragment.java index 9bfe0327dc3..8e3f8cabe35 100644 --- a/src/com/android/settings/deletionhelper/ActivationWarningFragment.java +++ b/src/com/android/settings/deletionhelper/ActivationWarningFragment.java @@ -19,11 +19,11 @@ package com.android.settings.deletionhelper; import android.app.Dialog; import android.os.Bundle; -import com.android.settings.R; - import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; +import com.android.settings.R; + /** * Fragment to warn the user about activating the storage manager. */ diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java index d228fa78a25..d11e68b64a4 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java @@ -19,14 +19,14 @@ import android.provider.Settings; import android.text.format.DateUtils; import android.text.format.Formatter; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.Utils; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * Handles the wall of text which appears below the options in the Storage Management settings drill * down. diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java index a0c450a3f15..221afb09142 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java @@ -24,6 +24,10 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.preference.DropDownPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -38,10 +42,6 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; -import androidx.preference.DropDownPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; - /** * AutomaticStorageManagerSettings is the Settings screen for configuration and management of the * automatic storage manager. diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java index 3182d8af0fe..eab19bed38a 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java @@ -21,15 +21,15 @@ import android.os.SystemProperties; import android.provider.Settings; import android.widget.Switch; +import androidx.fragment.app.FragmentManager; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.Preconditions; import com.android.settings.widget.SwitchBar; import com.android.settingslib.Utils; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; -import androidx.fragment.app.FragmentManager; -import androidx.preference.Preference; - /** Handles the logic for flipping the storage management toggle on a {@link SwitchBar}. */ public class AutomaticStorageManagerSwitchBarController implements SwitchBar.OnSwitchChangeListener { diff --git a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java index b27a36235e5..0f21deebf0d 100644 --- a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java +++ b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java @@ -22,6 +22,11 @@ import android.bluetooth.BluetoothCodecStatus; import android.bluetooth.BluetoothDevice; import android.content.Context; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -29,11 +34,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnDestroy; import com.android.settingslib.development.DeveloperOptionsPreferenceController; -import androidx.annotation.VisibleForTesting; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public abstract class AbstractBluetoothA2dpPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin, BluetoothServiceConnectionListener, LifecycleObserver, diff --git a/src/com/android/settings/development/AdbPreferenceController.java b/src/com/android/settings/development/AdbPreferenceController.java index 32812e534c6..468c5bdd5c9 100644 --- a/src/com/android/settings/development/AdbPreferenceController.java +++ b/src/com/android/settings/development/AdbPreferenceController.java @@ -19,12 +19,12 @@ package com.android.settings.development; import android.content.Context; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.AbstractEnableAdbPreferenceController; - import androidx.annotation.Nullable; import androidx.preference.Preference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.AbstractEnableAdbPreferenceController; + public class AdbPreferenceController extends AbstractEnableAdbPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java index 974591cec3c..14474f29785 100644 --- a/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java +++ b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class AllowAppsOnExternalPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java b/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java index e53037c3d28..766352a6cae 100644 --- a/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java +++ b/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java @@ -21,14 +21,14 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.view.IWindowManager; -import com.android.settings.R; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; +import com.android.settings.R; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class AnimatorDurationScalePreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java index dbf01428096..15e26633439 100644 --- a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java +++ b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java @@ -18,13 +18,13 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class AppsNotRespondingPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java b/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java index 5651d9b3f05..690d079257c 100644 --- a/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java +++ b/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java @@ -21,14 +21,14 @@ import android.app.IActivityManager; import android.content.Context; import android.os.RemoteException; -import com.android.settings.R; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; +import com.android.settings.R; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class BackgroundProcessLimitPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java b/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java index 860b2ef4dd0..b0e35d3de09 100644 --- a/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java +++ b/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java @@ -19,12 +19,12 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class BluetoothA2dpHwOffloadPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java b/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java index ba059107ffe..cbd77f589d0 100644 --- a/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java +++ b/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java @@ -21,13 +21,13 @@ import android.content.DialogInterface; import android.os.Bundle; import android.os.PowerManager; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.FragmentManager; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.FragmentManager; - public class BluetoothA2dpHwOffloadRebootDialog extends InstrumentedDialogFragment implements DialogInterface.OnClickListener { diff --git a/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java b/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java index 829f3fbafe6..77f0f507f8e 100644 --- a/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java +++ b/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class BluetoothAbsoluteVolumePreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java index 0aba44a1e52..136ddad5fcf 100644 --- a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java +++ b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java @@ -20,14 +20,14 @@ import android.content.Context; import android.os.SystemProperties; import android.text.TextUtils; -import com.android.settings.R; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; +import com.android.settings.R; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class BluetoothAvrcpVersionPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java index e56de101e30..849e981981b 100644 --- a/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java +++ b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class BluetoothDeviceNoNamePreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java index 0960625da93..ee6af1c8785 100644 --- a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java +++ b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java @@ -19,14 +19,14 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class BluetoothMaxConnectedAudioDevicesPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java index 0372cd6193b..c92fe90a936 100644 --- a/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java +++ b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class BluetoothSnoopLogPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/BugReportInPowerPreferenceController.java b/src/com/android/settings/development/BugReportInPowerPreferenceController.java index f09b4869837..99ced773255 100644 --- a/src/com/android/settings/development/BugReportInPowerPreferenceController.java +++ b/src/com/android/settings/development/BugReportInPowerPreferenceController.java @@ -20,13 +20,13 @@ import android.content.Context; import android.os.UserManager; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class BugReportInPowerPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java index 845e58a1e6a..ec0ca24b6e6 100644 --- a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java +++ b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java @@ -20,14 +20,14 @@ import android.content.Context; import android.os.SystemProperties; import android.text.TextUtils; -import com.android.settings.R; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.R; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class CameraLaserSensorPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java index 84978090693..ce23e3fc03c 100644 --- a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java +++ b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java @@ -25,14 +25,14 @@ import android.os.UserManager; import android.text.TextUtils; import android.util.Log; -import com.android.settings.Utils; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.Utils; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class ClearAdbKeysPreferenceController extends DeveloperOptionsPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/development/ClearAdbKeysWarningDialog.java b/src/com/android/settings/development/ClearAdbKeysWarningDialog.java index 3d81f1a8191..ce7e1499763 100644 --- a/src/com/android/settings/development/ClearAdbKeysWarningDialog.java +++ b/src/com/android/settings/development/ClearAdbKeysWarningDialog.java @@ -20,14 +20,14 @@ import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.R; -import com.android.settings.core.instrumentation.InstrumentedDialogFragment; - import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; +import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.R; +import com.android.settings.core.instrumentation.InstrumentedDialogFragment; + public class ClearAdbKeysWarningDialog extends InstrumentedDialogFragment implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener { diff --git a/src/com/android/settings/development/ColorModePreference.java b/src/com/android/settings/development/ColorModePreference.java index 8f9ef3aae6e..9e5666ef22e 100644 --- a/src/com/android/settings/development/ColorModePreference.java +++ b/src/com/android/settings/development/ColorModePreference.java @@ -24,13 +24,13 @@ import android.os.Looper; import android.util.AttributeSet; import android.view.Display; +import androidx.preference.SwitchPreference; + import com.android.settings.R; import java.util.ArrayList; import java.util.List; -import androidx.preference.SwitchPreference; - public class ColorModePreference extends SwitchPreference implements DisplayListener { private DisplayManager mDisplayManager; diff --git a/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java b/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java index c141ef56578..54df6badb02 100644 --- a/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java +++ b/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java @@ -20,15 +20,15 @@ import android.content.Context; import android.os.SystemProperties; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - public class CoolColorTemperaturePreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java b/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java index 68aae93be2c..da4b94b1593 100644 --- a/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java +++ b/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java @@ -21,14 +21,14 @@ import android.os.SystemProperties; import android.text.TextUtils; import android.view.ThreadedRenderer; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; -import androidx.preference.ListPreference; -import androidx.preference.Preference; - public class DebugGpuOverdrawPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java b/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java index ae4070dd9cd..8f15c8697b6 100644 --- a/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java +++ b/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java @@ -21,14 +21,14 @@ import android.os.SystemProperties; import android.text.TextUtils; import android.view.ThreadedRenderer; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; -import androidx.preference.ListPreference; -import androidx.preference.Preference; - public class DebugNonRectClipOperationsPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/DebugViewAttributesPreferenceController.java b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java index 963eb3bdb5b..04d819c86a6 100644 --- a/src/com/android/settings/development/DebugViewAttributesPreferenceController.java +++ b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class DebugViewAttributesPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 54ca6ef776f..937de208564 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -34,6 +34,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Switch; +import androidx.annotation.VisibleForTesting; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -55,9 +58,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; - @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFragment implements SwitchBar.OnSwitchChangeListener, OemUnlockDialogHost, AdbDialogHost, diff --git a/src/com/android/settings/development/DevelopmentSwitchBarController.java b/src/com/android/settings/development/DevelopmentSwitchBarController.java index 08ddc8690ec..84b7f9f2865 100644 --- a/src/com/android/settings/development/DevelopmentSwitchBarController.java +++ b/src/com/android/settings/development/DevelopmentSwitchBarController.java @@ -16,6 +16,8 @@ package com.android.settings.development; +import androidx.annotation.NonNull; + import com.android.settings.Utils; import com.android.settings.widget.SwitchBar; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -24,8 +26,6 @@ import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; import com.android.settingslib.development.DevelopmentSettingsEnabler; -import androidx.annotation.NonNull; - public class DevelopmentSwitchBarController implements LifecycleObserver, OnStart, OnStop { private final SwitchBar mSwitchBar; diff --git a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java index a1ecfd4594d..f10e171c8c7 100644 --- a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java +++ b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class DisableAutomaticUpdatesPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/DisableLogPersistWarningDialog.java b/src/com/android/settings/development/DisableLogPersistWarningDialog.java index b25e5ffb8a2..a2192c1f511 100644 --- a/src/com/android/settings/development/DisableLogPersistWarningDialog.java +++ b/src/com/android/settings/development/DisableLogPersistWarningDialog.java @@ -20,14 +20,14 @@ import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.R; -import com.android.settings.core.instrumentation.InstrumentedDialogFragment; - import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; +import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.R; +import com.android.settings.core.instrumentation.InstrumentedDialogFragment; + public class DisableLogPersistWarningDialog extends InstrumentedDialogFragment implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener { diff --git a/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java index 4ae8cec168f..e3c16f3dc5d 100644 --- a/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java +++ b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java @@ -27,6 +27,11 @@ import android.os.ServiceManager; import android.text.TextUtils; import android.view.DisplayCutout; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -34,11 +39,6 @@ import com.android.settingslib.development.DeveloperOptionsPreferenceController; import java.util.Comparator; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class EmulateDisplayCutoutPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/EnableAdbWarningDialog.java b/src/com/android/settings/development/EnableAdbWarningDialog.java index e191f306aa0..3eff3f84bfb 100644 --- a/src/com/android/settings/development/EnableAdbWarningDialog.java +++ b/src/com/android/settings/development/EnableAdbWarningDialog.java @@ -20,14 +20,14 @@ import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.R; -import com.android.settings.core.instrumentation.InstrumentedDialogFragment; - import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; +import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.R; +import com.android.settings.core.instrumentation.InstrumentedDialogFragment; + public class EnableAdbWarningDialog extends InstrumentedDialogFragment implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener { diff --git a/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java b/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java index ebc195e3b4d..5d102eb6b40 100644 --- a/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java +++ b/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java @@ -20,13 +20,13 @@ import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.FragmentManager; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.FragmentManager; - public class EnableDevelopmentSettingWarningDialog extends InstrumentedDialogFragment implements DialogInterface.OnClickListener { diff --git a/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java b/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java index 5def536b433..6348d623e19 100644 --- a/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java +++ b/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java @@ -19,12 +19,12 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class EnableGnssRawMeasFullTrackingPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java b/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java index 2a7e94487a5..163605fb175 100644 --- a/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java +++ b/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class EnableGpuDebugLayersPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java b/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java index cf077ca733b..6324ada8861 100644 --- a/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java +++ b/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java @@ -20,14 +20,14 @@ import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.R; -import com.android.settings.core.instrumentation.InstrumentedDialogFragment; - import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; +import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.R; +import com.android.settings.core.instrumentation.InstrumentedDialogFragment; + public class EnableOemUnlockSettingWarningDialog extends InstrumentedDialogFragment implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener { diff --git a/src/com/android/settings/development/FileEncryptionPreferenceController.java b/src/com/android/settings/development/FileEncryptionPreferenceController.java index 2e57c270382..a0628b0f637 100644 --- a/src/com/android/settings/development/FileEncryptionPreferenceController.java +++ b/src/com/android/settings/development/FileEncryptionPreferenceController.java @@ -23,13 +23,13 @@ import android.os.SystemProperties; import android.os.storage.IStorageManager; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - public class FileEncryptionPreferenceController extends DeveloperOptionsPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/development/ForceMSAAPreferenceController.java b/src/com/android/settings/development/ForceMSAAPreferenceController.java index dda03e03970..be6efca8772 100644 --- a/src/com/android/settings/development/ForceMSAAPreferenceController.java +++ b/src/com/android/settings/development/ForceMSAAPreferenceController.java @@ -19,14 +19,14 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; -import com.android.settingslib.development.SystemPropPoker; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import com.android.settingslib.development.SystemPropPoker; + public class ForceMSAAPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/FreeformWindowsPreferenceController.java b/src/com/android/settings/development/FreeformWindowsPreferenceController.java index ec63b6c7990..5b19f36c152 100644 --- a/src/com/android/settings/development/FreeformWindowsPreferenceController.java +++ b/src/com/android/settings/development/FreeformWindowsPreferenceController.java @@ -21,13 +21,13 @@ import android.os.Build; import android.provider.Settings; import android.text.TextUtils; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class FreeformWindowsPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java b/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java index 7986d363103..d79c231e334 100644 --- a/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java +++ b/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java @@ -19,12 +19,12 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + /** * Base controller for Switch preference that maps to a specific value in Settings.Global. */ diff --git a/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java index 5b54bd70027..0087e287093 100644 --- a/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java +++ b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java @@ -20,13 +20,13 @@ import android.content.Context; import android.os.SystemProperties; import android.view.ThreadedRenderer; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - public class GpuViewUpdatesPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java b/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java index 0dd5627083e..8ffbdcdc1cc 100644 --- a/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java +++ b/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java @@ -20,13 +20,13 @@ import android.content.Context; import android.os.SystemProperties; import android.view.ThreadedRenderer; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - public class HardwareLayersUpdatesPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/HardwareOverlaysPreferenceController.java b/src/com/android/settings/development/HardwareOverlaysPreferenceController.java index b299f93136f..c10e1070a48 100644 --- a/src/com/android/settings/development/HardwareOverlaysPreferenceController.java +++ b/src/com/android/settings/development/HardwareOverlaysPreferenceController.java @@ -22,13 +22,13 @@ import android.os.Parcel; import android.os.RemoteException; import android.os.ServiceManager; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class HardwareOverlaysPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/HdcpCheckingPreferenceController.java b/src/com/android/settings/development/HdcpCheckingPreferenceController.java index f268978351c..52fe8e04a76 100644 --- a/src/com/android/settings/development/HdcpCheckingPreferenceController.java +++ b/src/com/android/settings/development/HdcpCheckingPreferenceController.java @@ -21,15 +21,15 @@ import android.os.Build; import android.os.SystemProperties; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; -import androidx.annotation.VisibleForTesting; -import androidx.preference.ListPreference; -import androidx.preference.Preference; - public class HdcpCheckingPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/HighFrequencyDisplayPreferenceController.java b/src/com/android/settings/development/HighFrequencyDisplayPreferenceController.java index cbb8d4ce6d0..ad8e9f8d736 100644 --- a/src/com/android/settings/development/HighFrequencyDisplayPreferenceController.java +++ b/src/com/android/settings/development/HighFrequencyDisplayPreferenceController.java @@ -21,17 +21,14 @@ import android.os.IBinder; import android.os.Parcel; import android.os.RemoteException; import android.os.ServiceManager; -import android.text.TextUtils; - -import com.android.settings.R; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; import androidx.annotation.VisibleForTesting; -import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class HighFrequencyDisplayPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/KeepActivitiesPreferenceController.java b/src/com/android/settings/development/KeepActivitiesPreferenceController.java index 90762232259..0ba2c42dbcf 100644 --- a/src/com/android/settings/development/KeepActivitiesPreferenceController.java +++ b/src/com/android/settings/development/KeepActivitiesPreferenceController.java @@ -22,14 +22,14 @@ import android.content.Context; import android.os.RemoteException; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class KeepActivitiesPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java index 2358a649008..d970f4266eb 100644 --- a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java +++ b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java @@ -22,13 +22,13 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - public class LocalBackupPasswordPreferenceController extends DeveloperOptionsPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/development/LocalTerminalPreferenceController.java b/src/com/android/settings/development/LocalTerminalPreferenceController.java index 7ffd92dd564..d48615c7fcf 100644 --- a/src/com/android/settings/development/LocalTerminalPreferenceController.java +++ b/src/com/android/settings/development/LocalTerminalPreferenceController.java @@ -4,14 +4,14 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.UserManager; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class LocalTerminalPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/LogPersistPreferenceController.java b/src/com/android/settings/development/LogPersistPreferenceController.java index 0cb09e82b65..1386cec3706 100644 --- a/src/com/android/settings/development/LogPersistPreferenceController.java +++ b/src/com/android/settings/development/LogPersistPreferenceController.java @@ -18,13 +18,13 @@ package com.android.settings.development; import android.content.Context; +import androidx.annotation.Nullable; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.development.AbstractLogpersistPreferenceController; -import androidx.annotation.Nullable; -import androidx.preference.Preference; - public class LogPersistPreferenceController extends AbstractLogpersistPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/development/LogdSizePreferenceController.java b/src/com/android/settings/development/LogdSizePreferenceController.java index f4120c628da..3a62e63175e 100644 --- a/src/com/android/settings/development/LogdSizePreferenceController.java +++ b/src/com/android/settings/development/LogdSizePreferenceController.java @@ -18,11 +18,11 @@ package com.android.settings.development; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.AbstractLogdSizePreferenceController; -import androidx.preference.Preference; - public class LogdSizePreferenceController extends AbstractLogdSizePreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/MemoryUsagePreferenceController.java b/src/com/android/settings/development/MemoryUsagePreferenceController.java index 9a7d6b11c56..1b20e70a578 100644 --- a/src/com/android/settings/development/MemoryUsagePreferenceController.java +++ b/src/com/android/settings/development/MemoryUsagePreferenceController.java @@ -19,6 +19,10 @@ package com.android.settings.development; import android.content.Context; import android.text.format.Formatter; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.ProcStatsData; import com.android.settings.applications.ProcessStatsBase; @@ -26,10 +30,6 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.utils.ThreadUtils; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class MemoryUsagePreferenceController extends DeveloperOptionsPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java index 21d6e4e3c89..78054ae2ab7 100644 --- a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java +++ b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class MobileDataAlwaysOnPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/MockLocationAppPreferenceController.java b/src/com/android/settings/development/MockLocationAppPreferenceController.java index 02ea1af721e..0d8c07a8456 100644 --- a/src/com/android/settings/development/MockLocationAppPreferenceController.java +++ b/src/com/android/settings/development/MockLocationAppPreferenceController.java @@ -28,14 +28,14 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import java.util.List; -import androidx.preference.Preference; - public class MockLocationAppPreferenceController extends DeveloperOptionsPreferenceController implements PreferenceControllerMixin, OnActivityResultListener { diff --git a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java index 81373f38e1e..775b70871f2 100644 --- a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java +++ b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java @@ -20,13 +20,13 @@ import android.content.Context; import android.os.Build; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class NotificationChannelWarningsPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/OemLockInfoDialog.java b/src/com/android/settings/development/OemLockInfoDialog.java index f197c6aab3d..3136ec1519c 100644 --- a/src/com/android/settings/development/OemLockInfoDialog.java +++ b/src/com/android/settings/development/OemLockInfoDialog.java @@ -19,14 +19,14 @@ package com.android.settings.development; import android.app.Dialog; import android.os.Bundle; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.R; -import com.android.settings.core.instrumentation.InstrumentedDialogFragment; - import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; +import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.R; +import com.android.settings.core.instrumentation.InstrumentedDialogFragment; + public class OemLockInfoDialog extends InstrumentedDialogFragment { private static final String TAG = "OemLockInfoDialog"; diff --git a/src/com/android/settings/development/OemUnlockPreferenceController.java b/src/com/android/settings/development/OemUnlockPreferenceController.java index c68750285ed..cadb0bcfd6b 100644 --- a/src/com/android/settings/development/OemUnlockPreferenceController.java +++ b/src/com/android/settings/development/OemUnlockPreferenceController.java @@ -28,16 +28,16 @@ import android.os.UserManager; import android.service.oemlock.OemLockManager; import android.telephony.TelephonyManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.development.DeveloperOptionsPreferenceController; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin, OnActivityResultListener { diff --git a/src/com/android/settings/development/PictureColorModePreferenceController.java b/src/com/android/settings/development/PictureColorModePreferenceController.java index 20f2d9a5f7f..3cf1f4e8bbf 100644 --- a/src/com/android/settings/development/PictureColorModePreferenceController.java +++ b/src/com/android/settings/development/PictureColorModePreferenceController.java @@ -18,6 +18,9 @@ package com.android.settings.development; import android.content.Context; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; @@ -25,9 +28,6 @@ import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.development.DeveloperOptionsPreferenceController; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceScreen; - public class PictureColorModePreferenceController extends DeveloperOptionsPreferenceController implements LifecycleObserver, OnResume, OnPause, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/PointerLocationPreferenceController.java b/src/com/android/settings/development/PointerLocationPreferenceController.java index 15f56d1cede..0fd0137cb24 100644 --- a/src/com/android/settings/development/PointerLocationPreferenceController.java +++ b/src/com/android/settings/development/PointerLocationPreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class PointerLocationPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java b/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java index bb4182e1f33..52e730ba36a 100644 --- a/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java +++ b/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java @@ -21,14 +21,14 @@ import android.os.SystemProperties; import android.text.TextUtils; import android.view.ThreadedRenderer; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; -import androidx.preference.ListPreference; -import androidx.preference.Preference; - public class ProfileGpuRenderingPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/ResizableActivityPreferenceController.java b/src/com/android/settings/development/ResizableActivityPreferenceController.java index e1682264b80..c74e995540d 100644 --- a/src/com/android/settings/development/ResizableActivityPreferenceController.java +++ b/src/com/android/settings/development/ResizableActivityPreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class ResizableActivityPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/RtlLayoutPreferenceController.java b/src/com/android/settings/development/RtlLayoutPreferenceController.java index 892ea4ea12b..97b366a5a6c 100644 --- a/src/com/android/settings/development/RtlLayoutPreferenceController.java +++ b/src/com/android/settings/development/RtlLayoutPreferenceController.java @@ -20,14 +20,14 @@ import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; -import com.android.internal.app.LocalePicker; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.internal.app.LocalePicker; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class RtlLayoutPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/SecondaryDisplayPreferenceController.java b/src/com/android/settings/development/SecondaryDisplayPreferenceController.java index 749658562bc..3e1653d8a43 100644 --- a/src/com/android/settings/development/SecondaryDisplayPreferenceController.java +++ b/src/com/android/settings/development/SecondaryDisplayPreferenceController.java @@ -20,13 +20,13 @@ import android.content.Context; import android.provider.Settings; import android.text.TextUtils; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; -import androidx.preference.ListPreference; -import androidx.preference.Preference; - public class SecondaryDisplayPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java b/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java index 029509d9cd0..a72c0e05e1a 100644 --- a/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java +++ b/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java @@ -19,12 +19,12 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + /** * Base controller for Switch preference that maps to a specific value in Settings.Secure. */ diff --git a/src/com/android/settings/development/SelectDebugAppPreferenceController.java b/src/com/android/settings/development/SelectDebugAppPreferenceController.java index 7f92a346cbe..ce6c7c4644e 100644 --- a/src/com/android/settings/development/SelectDebugAppPreferenceController.java +++ b/src/com/android/settings/development/SelectDebugAppPreferenceController.java @@ -26,13 +26,13 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - public class SelectDebugAppPreferenceController extends DeveloperOptionsPreferenceController implements PreferenceControllerMixin, OnActivityResultListener { diff --git a/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java index b7df198a39f..05ddf3abba8 100644 --- a/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java +++ b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java @@ -24,12 +24,12 @@ import android.text.TextUtils; import android.util.Log; import android.widget.Toast; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; -import androidx.preference.Preference; - public class ShortcutManagerThrottlingPreferenceController extends DeveloperOptionsPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java b/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java index f876c5428f4..5e0cda82944 100644 --- a/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java +++ b/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class ShowFirstCrashDialogPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java index ac412c78a24..fb091b7d473 100644 --- a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java +++ b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java @@ -20,13 +20,13 @@ import android.content.Context; import android.os.SystemProperties; import android.view.View; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - public class ShowLayoutBoundsPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java index 4a03fb53c2e..5dadb6ff6c2 100644 --- a/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java +++ b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java @@ -22,13 +22,13 @@ import android.os.Parcel; import android.os.RemoteException; import android.os.ServiceManager; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class ShowSurfaceUpdatesPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/ShowTapsPreferenceController.java b/src/com/android/settings/development/ShowTapsPreferenceController.java index 08596eee8cc..25d421ddf2b 100644 --- a/src/com/android/settings/development/ShowTapsPreferenceController.java +++ b/src/com/android/settings/development/ShowTapsPreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class ShowTapsPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/SimulateColorSpacePreferenceController.java b/src/com/android/settings/development/SimulateColorSpacePreferenceController.java index 2d813fd71d9..56fa76d379c 100644 --- a/src/com/android/settings/development/SimulateColorSpacePreferenceController.java +++ b/src/com/android/settings/development/SimulateColorSpacePreferenceController.java @@ -22,14 +22,14 @@ import android.content.res.Resources; import android.provider.Settings; import android.view.accessibility.AccessibilityManager; -import com.android.settings.R; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; +import com.android.settings.R; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class SimulateColorSpacePreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/StayAwakePreferenceController.java b/src/com/android/settings/development/StayAwakePreferenceController.java index 1bea6d34fe5..7d67b9e4d07 100644 --- a/src/com/android/settings/development/StayAwakePreferenceController.java +++ b/src/com/android/settings/development/StayAwakePreferenceController.java @@ -24,6 +24,10 @@ import android.os.BatteryManager; import android.os.Handler; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; @@ -33,10 +37,6 @@ import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.development.DeveloperOptionsPreferenceController; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class StayAwakePreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause, diff --git a/src/com/android/settings/development/StrictModePreferenceController.java b/src/com/android/settings/development/StrictModePreferenceController.java index f1ec81b8f0f..c28e4766219 100644 --- a/src/com/android/settings/development/StrictModePreferenceController.java +++ b/src/com/android/settings/development/StrictModePreferenceController.java @@ -23,13 +23,13 @@ import android.os.StrictMode; import android.os.SystemProperties; import android.view.IWindowManager; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class StrictModePreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java b/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java index 09263a127e8..476cf50ffe6 100644 --- a/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java +++ b/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java @@ -19,12 +19,12 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + /** * Base controller for Switch preference that maps to a specific value in Settings.System. */ diff --git a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java index 12776024098..f838a76cfa8 100644 --- a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java +++ b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class TetheringHardwareAccelPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java b/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java index a6859a14778..0a8e941ea57 100644 --- a/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java +++ b/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java @@ -21,14 +21,14 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.view.IWindowManager; -import com.android.settings.R; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; +import com.android.settings.R; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class TransitionAnimationScalePreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java index 0c1bf2543db..335a48de82a 100644 --- a/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java +++ b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class UsbAudioRoutingPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java index b396f2d3003..29653a0925e 100644 --- a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java +++ b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java @@ -24,6 +24,9 @@ import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; @@ -32,9 +35,6 @@ import com.android.settingslib.development.DeveloperOptionsPreferenceController; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - /** * Controller to manage the state of "Verify apps over USB" toggle. */ diff --git a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java index 268def27b41..d11fe37c66a 100644 --- a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java +++ b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java @@ -28,13 +28,13 @@ import android.os.RemoteException; import android.provider.Settings; import android.text.TextUtils; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class WaitForDebuggerPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin, OnActivityResultListener { diff --git a/src/com/android/settings/development/WebViewAppPreferenceController.java b/src/com/android/settings/development/WebViewAppPreferenceController.java index 70eb33bfad2..74d6c105a4b 100644 --- a/src/com/android/settings/development/WebViewAppPreferenceController.java +++ b/src/com/android/settings/development/WebViewAppPreferenceController.java @@ -22,15 +22,15 @@ import android.content.pm.PackageManager; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.webview.WebViewUpdateServiceWrapper; import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.development.DeveloperOptionsPreferenceController; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - public class WebViewAppPreferenceController extends DeveloperOptionsPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java b/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java index 2497ef4f093..fed07f65436 100644 --- a/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java +++ b/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java @@ -19,14 +19,14 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import com.android.settings.R; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.R; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class WifiConnectedMacRandomizationPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java index bfd77c472da..0236f1585e2 100644 --- a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java +++ b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class WifiDisplayCertificationPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java index dd995618aee..de53a2d7146 100644 --- a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java +++ b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.development; import android.content.Context; import android.net.wifi.WifiManager; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class WifiVerboseLoggingPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/WindowAnimationScalePreferenceController.java b/src/com/android/settings/development/WindowAnimationScalePreferenceController.java index 7c373e73461..70b2e2de186 100644 --- a/src/com/android/settings/development/WindowAnimationScalePreferenceController.java +++ b/src/com/android/settings/development/WindowAnimationScalePreferenceController.java @@ -21,14 +21,14 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.view.IWindowManager; -import com.android.settings.R; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; +import com.android.settings.R; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + public class WindowAnimationScalePreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/autofill/AbstractGlobalSettingsPreference.java b/src/com/android/settings/development/autofill/AbstractGlobalSettingsPreference.java index 080c387202f..491deac9bb0 100644 --- a/src/com/android/settings/development/autofill/AbstractGlobalSettingsPreference.java +++ b/src/com/android/settings/development/autofill/AbstractGlobalSettingsPreference.java @@ -15,25 +15,16 @@ package com.android.settings.development.autofill; import android.content.Context; -import android.content.res.Resources; import android.provider.Settings; -import android.text.BidiFormatter; import android.text.InputType; import android.util.AttributeSet; -import android.util.DisplayMetrics; import android.util.Log; -import android.util.Slog; -import android.view.Display; import android.view.View; -import android.view.autofill.AutofillManager; import android.widget.EditText; -import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.CustomEditTextPreferenceCompat; -import java.text.NumberFormat; - /** * Base class for Autofill integer properties that are backed by * {@link android.provider.Settings.Global}. diff --git a/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceController.java b/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceController.java index 8618bc542c8..8c739e3e68c 100644 --- a/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceController.java +++ b/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceController.java @@ -22,13 +22,13 @@ import android.provider.Settings; import android.util.Log; import android.view.autofill.AutofillManager; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; -import androidx.preference.ListPreference; -import androidx.preference.Preference; - public final class AutofillLoggingLevelPreferenceController extends DeveloperOptionsPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/development/autofill/AutofillMaxPartitionsPreference.java b/src/com/android/settings/development/autofill/AutofillMaxPartitionsPreference.java index ab0cec9338f..f8099b7fa63 100644 --- a/src/com/android/settings/development/autofill/AutofillMaxPartitionsPreference.java +++ b/src/com/android/settings/development/autofill/AutofillMaxPartitionsPreference.java @@ -19,8 +19,6 @@ import android.provider.Settings; import android.util.AttributeSet; import android.view.autofill.AutofillManager; -import java.text.NumberFormat; - public final class AutofillMaxPartitionsPreference extends AbstractGlobalSettingsPreference { public AutofillMaxPartitionsPreference(Context context, AttributeSet attrs) { diff --git a/src/com/android/settings/development/autofill/AutofillPreferenceCategory.java b/src/com/android/settings/development/autofill/AutofillPreferenceCategory.java index 711100d2862..cbfbdd3392c 100644 --- a/src/com/android/settings/development/autofill/AutofillPreferenceCategory.java +++ b/src/com/android/settings/development/autofill/AutofillPreferenceCategory.java @@ -20,7 +20,6 @@ import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; import android.os.Looper; -import android.os.UserHandle; import android.provider.Settings; import android.util.AttributeSet; import android.util.Log; diff --git a/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceController.java b/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceController.java index 42f7a48e923..d30d0bb25e0 100644 --- a/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceController.java +++ b/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceController.java @@ -18,19 +18,17 @@ package com.android.settings.development.autofill; import android.content.ContentResolver; import android.content.Context; -import android.content.res.Resources; import android.provider.Settings; import android.text.TextUtils; import android.view.autofill.AutofillManager; import android.widget.Toast; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; -import androidx.preference.ListPreference; -import androidx.preference.Preference; - public final class AutofillResetOptionsPreferenceController extends DeveloperOptionsPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java b/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java index 4892bc04245..7670ef1e25b 100644 --- a/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java +++ b/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java @@ -21,12 +21,12 @@ import android.os.SystemProperties; import android.text.TextUtils; import android.util.FeatureFlagUtils; +import androidx.annotation.VisibleForTesting; + import com.android.settings.core.FeatureFlags; import java.util.HashSet; -import androidx.annotation.VisibleForTesting; - /** * Helper class to get feature persistent flag information. */ diff --git a/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java b/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java index 6de83a8dbb4..e6bd2095c52 100644 --- a/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java +++ b/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java @@ -19,15 +19,15 @@ package com.android.settings.development.featureflags; import android.content.Context; import android.util.FeatureFlagUtils; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import java.util.Map; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - public class FeatureFlagsPreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart { diff --git a/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java b/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java index 4d12b39b5d9..c271bc99b97 100644 --- a/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java +++ b/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java @@ -27,16 +27,16 @@ import android.os.ServiceManager; import android.service.quicksettings.TileService; import android.util.Log; -import com.android.internal.statusbar.IStatusBarService; -import com.android.settings.core.BasePreferenceController; - -import java.util.List; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import com.android.internal.statusbar.IStatusBarService; +import com.android.settings.core.BasePreferenceController; + +import java.util.List; + public class DevelopmentTilePreferenceController extends BasePreferenceController { private static final String TAG = "DevTilePrefController"; diff --git a/src/com/android/settings/development/qstile/DevelopmentTiles.java b/src/com/android/settings/development/qstile/DevelopmentTiles.java index ec017c510be..827705d8035 100644 --- a/src/com/android/settings/development/qstile/DevelopmentTiles.java +++ b/src/com/android/settings/development/qstile/DevelopmentTiles.java @@ -34,13 +34,13 @@ import android.view.View; import android.view.WindowManagerGlobal; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; + import com.android.internal.app.LocalePicker; import com.android.internal.statusbar.IStatusBarService; import com.android.settingslib.development.DevelopmentSettingsEnabler; import com.android.settingslib.development.SystemPropPoker; -import androidx.annotation.VisibleForTesting; - public abstract class DevelopmentTiles extends TileService { private static final String TAG = "DevelopmentTiles"; diff --git a/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java b/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java index 6f6327996ca..5d07f2c238c 100644 --- a/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java +++ b/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java @@ -20,6 +20,9 @@ import android.accounts.Account; import android.content.Context; import android.os.Bundle; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.accounts.AccountDetailDashboardFragment; @@ -28,9 +31,6 @@ import com.android.settings.core.BasePreferenceController; import com.android.settings.core.SubSettingLauncher; import com.android.settings.overlay.FeatureFactory; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class BrandedAccountPreferenceController extends BasePreferenceController { private static final String KEY_PREFERENCE_TITLE = "branded_account"; private final Account[] mAccounts; diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java index 171a6d39813..f6ef632ef23 100644 --- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java +++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java @@ -29,6 +29,10 @@ import android.text.TextUtils; import android.util.Pair; import android.widget.Toast; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; @@ -43,10 +47,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.development.DevelopmentSettingsEnabler; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class BuildNumberPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnResume { diff --git a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java index 9040227c91c..8fdd19fe03f 100644 --- a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java +++ b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java @@ -20,6 +20,10 @@ import android.os.Build; import android.text.TextUtils; import android.util.Log; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.DeviceInfoUtils; @@ -28,10 +32,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class DeviceModelPreferenceController extends BasePreferenceController { diff --git a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java index d8e2e79107d..2720979e0b0 100644 --- a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java +++ b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java @@ -25,18 +25,18 @@ import android.os.Bundle; import android.provider.Settings; import android.text.SpannedString; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + +import com.android.settings.R; import com.android.settings.bluetooth.BluetoothLengthDeviceNameFilter; import com.android.settings.core.BasePreferenceController; -import com.android.settings.R; import com.android.settings.widget.ValidatedEditTextPreference; import com.android.settings.wifi.tether.WifiDeviceNameTextValidator; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnCreate; import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class DeviceNamePreferenceController extends BasePreferenceController implements ValidatedEditTextPreference.Validator, Preference.OnPreferenceChangeListener, diff --git a/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java b/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java index 4a2ad243ff1..1150838dacf 100644 --- a/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java +++ b/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java @@ -19,13 +19,13 @@ import android.content.Context; import android.os.SystemProperties; import android.text.TextUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class FccEquipmentIdPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java b/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java index cd91b574870..d94586be094 100644 --- a/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java +++ b/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java @@ -19,13 +19,13 @@ import android.content.Context; import android.content.Intent; import android.text.TextUtils; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.DeviceInfoUtils; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; - public class FeedbackPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { private static final String KEY_DEVICE_FEEDBACK = "device_feedback"; diff --git a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java index 3057fa0dc4e..fef034267cd 100644 --- a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java +++ b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java @@ -25,13 +25,13 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; - public class HardwareInfoDialogFragment extends InstrumentedDialogFragment { public static final String TAG = "HardwareInfo"; diff --git a/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java b/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java index 4824a4b40cc..5c2b6417102 100644 --- a/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java +++ b/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java @@ -17,12 +17,12 @@ package com.android.settings.deviceinfo; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.DeviceInfoUtils; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; - public class KernelVersionPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java index 83138f9c085..8e60b06fee2 100644 --- a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java +++ b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java @@ -24,6 +24,10 @@ import android.text.BidiFormatter; import android.text.TextDirectionHeuristics; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.DeviceInfoUtils; @@ -32,10 +36,6 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class PhoneNumberPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java index ebd976b0ba3..41f8650ed34 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java @@ -30,16 +30,16 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.search.actionbar.SearchMenuController; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; - public class PrivateVolumeForget extends InstrumentedFragment { @VisibleForTesting static final String TAG_FORGET_CONFIRM = "forget_confirm"; diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java b/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java index 0bac2964c02..83b55f82577 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static android.os.storage.DiskInfo.EXTRA_DISK_ID; + import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_FORGET_UUID; import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_PRIVATE; diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java index 997f0d27361..1812974ece9 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java @@ -45,6 +45,13 @@ import android.view.MenuItem; import android.view.View; import android.widget.EditText; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Settings.StorageUseActivity; @@ -64,13 +71,6 @@ import java.util.HashMap; import java.util.List; import java.util.Objects; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - /** * Panel showing summary and actions for a {@link VolumeInfo#TYPE_PRIVATE} * storage volume. diff --git a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java index 70838ca1014..84769744839 100644 --- a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java @@ -35,6 +35,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.Preconditions; import com.android.settings.R; @@ -45,9 +48,6 @@ import com.android.settings.deviceinfo.StorageSettings.UnmountTask; import java.io.File; import java.util.Objects; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * Panel showing summary and actions for a {@link VolumeInfo#TYPE_PUBLIC} * storage volume. diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java index 03a2ada5492..8fb3ef18ff3 100644 --- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java +++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java @@ -29,6 +29,10 @@ import android.provider.SearchIndexableResource; import android.util.SparseArray; import android.view.View; +import androidx.annotation.VisibleForTesting; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; @@ -54,10 +58,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.Loader; - @SearchIndexable public class StorageDashboardFragment extends DashboardFragment implements diff --git a/src/com/android/settings/deviceinfo/StorageItemPreference.java b/src/com/android/settings/deviceinfo/StorageItemPreference.java index d20d21be00d..0766a740b3f 100644 --- a/src/com/android/settings/deviceinfo/StorageItemPreference.java +++ b/src/com/android/settings/deviceinfo/StorageItemPreference.java @@ -21,12 +21,12 @@ import android.content.res.Resources; import android.util.AttributeSet; import android.widget.ProgressBar; -import com.android.settings.R; -import com.android.settings.utils.FileSizeFormatter; - import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; +import com.android.settings.utils.FileSizeFormatter; + public class StorageItemPreference extends Preference { public int userHandle; diff --git a/src/com/android/settings/deviceinfo/StorageProfileFragment.java b/src/com/android/settings/deviceinfo/StorageProfileFragment.java index 06c9802baba..2a865bf2f07 100644 --- a/src/com/android/settings/deviceinfo/StorageProfileFragment.java +++ b/src/com/android/settings/deviceinfo/StorageProfileFragment.java @@ -24,6 +24,10 @@ import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; import android.util.SparseArray; +import androidx.annotation.VisibleForTesting; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; @@ -38,10 +42,6 @@ import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.Loader; - /** * StorageProfileFragment is a fragment which shows the storage results for a profile of the * primary user. diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java index f4ea580de1e..415af58dfc4 100644 --- a/src/com/android/settings/deviceinfo/StorageSettings.java +++ b/src/com/android/settings/deviceinfo/StorageSettings.java @@ -39,6 +39,13 @@ import android.text.format.Formatter.BytesResult; import android.util.Log; import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -58,13 +65,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; - /** * Panel showing both internal storage (both built-in storage and private * volumes) and removable storage (public volumes). diff --git a/src/com/android/settings/deviceinfo/StorageSummaryPreference.java b/src/com/android/settings/deviceinfo/StorageSummaryPreference.java index 481e0444cbb..72b67de1ddd 100644 --- a/src/com/android/settings/deviceinfo/StorageSummaryPreference.java +++ b/src/com/android/settings/deviceinfo/StorageSummaryPreference.java @@ -23,11 +23,11 @@ import android.view.View; import android.widget.ProgressBar; import android.widget.TextView; -import com.android.settings.R; - import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; + public class StorageSummaryPreference extends Preference { private int mPercent = -1; diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java index db5339d4aaa..14fd42e23d4 100644 --- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java +++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java @@ -30,6 +30,9 @@ import android.view.View.OnClickListener; import android.widget.ImageView; import android.widget.ProgressBar; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.deviceinfo.StorageSettings.UnmountTask; import com.android.settingslib.Utils; @@ -37,9 +40,6 @@ import com.android.settingslib.Utils; import java.io.File; import java.io.IOException; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - /** * Preference line representing a single {@link VolumeInfo}, possibly including * quick actions like unmounting. diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java index c6d0b2f675f..ef0e46b745e 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardBase.java +++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java @@ -18,6 +18,7 @@ package com.android.settings.deviceinfo; import static android.os.storage.DiskInfo.EXTRA_DISK_ID; import static android.os.storage.VolumeInfo.EXTRA_VOLUME_ID; + import static com.android.settings.deviceinfo.StorageSettings.TAG; import android.annotation.LayoutRes; @@ -39,6 +40,8 @@ import android.widget.FrameLayout; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.fragment.app.FragmentActivity; + import com.android.settings.R; import com.android.settingslib.Utils; import com.android.setupwizardlib.GlifLayout; @@ -47,8 +50,6 @@ import java.text.NumberFormat; import java.util.List; import java.util.Objects; -import androidx.fragment.app.FragmentActivity; - public abstract class StorageWizardBase extends FragmentActivity { protected static final String EXTRA_FORMAT_FORGET_UUID = "format_forget_uuid"; protected static final String EXTRA_FORMAT_PRIVATE = "format_private"; diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java index c3d034f5e40..5e3c86e1add 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java +++ b/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static android.os.storage.DiskInfo.EXTRA_DISK_ID; + import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_FORGET_UUID; import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_PRIVATE; @@ -28,13 +29,13 @@ import android.os.storage.DiskInfo; import android.os.storage.StorageManager; import android.text.TextUtils; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.FragmentActivity; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.FragmentActivity; - public class StorageWizardFormatConfirm extends InstrumentedDialogFragment { private static final String TAG_FORMAT_WARNING = "format_warning"; diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java index 2d94597c622..1e8c1691bc2 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java +++ b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static android.os.storage.VolumeInfo.TYPE_PRIVATE; + import static com.android.settings.deviceinfo.StorageSettings.TAG; import android.content.Intent; diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java index f15665f77eb..60f3cb5d4cb 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java +++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static android.content.pm.PackageManager.EXTRA_MOVE_ID; + import static com.android.settings.deviceinfo.StorageSettings.TAG; import android.content.Context; diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java index 214f0c291bd..10b78af0d7a 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java +++ b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java @@ -20,6 +20,7 @@ import static android.content.Intent.EXTRA_PACKAGE_NAME; import static android.content.Intent.EXTRA_TITLE; import static android.content.pm.PackageManager.EXTRA_MOVE_ID; import static android.os.storage.VolumeInfo.EXTRA_VOLUME_ID; + import static com.android.settings.deviceinfo.StorageSettings.TAG; import android.content.Intent; diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java index a0185e46373..7a2f0c105f3 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java +++ b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java @@ -18,6 +18,7 @@ package com.android.settings.deviceinfo; import static android.content.Intent.EXTRA_TITLE; import static android.content.pm.PackageManager.EXTRA_MOVE_ID; + import static com.android.settings.deviceinfo.StorageSettings.TAG; import android.content.pm.PackageManager; diff --git a/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialog.java b/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialog.java index 0224040d4fa..5633c11cc47 100644 --- a/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialog.java +++ b/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialog.java @@ -20,13 +20,13 @@ import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.FragmentManager; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.FragmentManager; - /** * Warning dialog to let the user know where the device name will be shown before setting it. */ diff --git a/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java index 0f7f2e94ad5..0e36d85899a 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java @@ -19,11 +19,11 @@ package com.android.settings.deviceinfo.firmwareversion; import android.content.Context; import android.os.SystemProperties; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.Utils; -import androidx.annotation.VisibleForTesting; - public class BasebandVersionDialogController { @VisibleForTesting diff --git a/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java index b8e18858adc..ba4eb7af748 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java @@ -19,10 +19,10 @@ package com.android.settings.deviceinfo.firmwareversion; import android.os.Build; import android.text.BidiFormatter; -import com.android.settings.R; - import androidx.annotation.VisibleForTesting; +import com.android.settings.R; + public class BuildNumberDialogController { @VisibleForTesting diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java index e43091dc4b5..17415cca573 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java @@ -25,11 +25,11 @@ import android.os.UserManager; import android.util.Log; import android.view.View; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; -import androidx.annotation.VisibleForTesting; - public class FirmwareVersionDialogController implements View.OnClickListener { private static final String TAG = "firmwareDialogCtrl"; diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java index 9c6075e6fc2..5dbc5ac5744 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java @@ -22,14 +22,14 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.R; -import com.android.settings.core.instrumentation.InstrumentedDialogFragment; - import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; +import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.R; +import com.android.settings.core.instrumentation.InstrumentedDialogFragment; + public class FirmwareVersionDialogFragment extends InstrumentedDialogFragment { private static final String TAG = "firmwareVersionDialog"; diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java index f31a504bfe7..d2d3bf441be 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java @@ -20,11 +20,11 @@ import android.content.Context; import android.os.Build; import android.text.TextUtils; -import com.android.settings.core.BasePreferenceController; - import androidx.fragment.app.Fragment; import androidx.preference.Preference; +import com.android.settings.core.BasePreferenceController; + public class FirmwareVersionPreferenceController extends BasePreferenceController { private Fragment mFragment; diff --git a/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java index 36ebc395a50..0d816d563e8 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java @@ -16,11 +16,11 @@ package com.android.settings.deviceinfo.firmwareversion; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settingslib.DeviceInfoUtils; -import androidx.annotation.VisibleForTesting; - public class KernelVersionDialogController { @VisibleForTesting diff --git a/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java index 221b7e28f1f..9037fe7e518 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java @@ -24,11 +24,11 @@ import android.text.TextUtils; import android.util.Log; import android.view.View; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settingslib.DeviceInfoUtils; -import androidx.annotation.VisibleForTesting; - public class SecurityPatchLevelDialogController implements View.OnClickListener { private static final String TAG = "SecurityPatchCtrl"; diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java index a7b8a7a9af9..577b478dc91 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java @@ -27,14 +27,14 @@ import android.text.Spanned; import android.text.TextUtils; import android.text.style.TtsSpan; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + import com.android.internal.telephony.PhoneConstants; import com.android.settings.R; import java.util.List; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; - public class ImeiInfoDialogController { @VisibleForTesting diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java index 808edd4bec8..5347fa7813c 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java @@ -23,16 +23,16 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.R; -import com.android.settings.core.instrumentation.InstrumentedDialogFragment; - import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; +import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.R; +import com.android.settings.core.instrumentation.InstrumentedDialogFragment; + public class ImeiInfoDialogFragment extends InstrumentedDialogFragment { @VisibleForTesting diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java index 75a1333e0b6..66d68a629c8 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java @@ -21,6 +21,11 @@ import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA; import android.content.Context; import android.telephony.TelephonyManager; +import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController; @@ -28,11 +33,6 @@ import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceCon import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * Controller that manages preference for single and multi sim devices. */ diff --git a/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java b/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java index 6a67e4b7d62..0e164747b6f 100644 --- a/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java +++ b/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java @@ -20,13 +20,13 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public abstract class LegalPreferenceController extends BasePreferenceController { private final PackageManager mPackageManager; diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java index 121bc03cf08..9cea62d1e31 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java @@ -44,6 +44,9 @@ import android.text.TextDirectionHeuristics; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settingslib.DeviceInfoUtils; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -53,9 +56,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.List; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; - public class SimStatusDialogController implements LifecycleObserver, OnResume, OnPause { private final static String TAG = "SimStatusDialogCtrl"; diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java index 2dd378579a1..ca1c6efa5a5 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java @@ -23,14 +23,14 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.R; -import com.android.settings.core.instrumentation.InstrumentedDialogFragment; - import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; +import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.R; +import com.android.settings.core.instrumentation.InstrumentedDialogFragment; + public class SimStatusDialogFragment extends InstrumentedDialogFragment { private static final String SIM_SLOT_BUNDLE_KEY = "arg_key_sim_slot"; diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java index 7c211c29707..02c191679d1 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java @@ -21,6 +21,11 @@ import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController; @@ -28,11 +33,6 @@ import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceCon import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class SimStatusPreferenceController extends AbstractSimStatusImeiInfoPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java index 02965afe6ec..a9c98d5714a 100644 --- a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java @@ -21,6 +21,10 @@ import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.FragmentManager; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.BasePreferenceController; import com.android.settings.deletionhelper.ActivationWarningFragment; @@ -33,10 +37,6 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.annotation.VisibleForTesting; -import androidx.fragment.app.FragmentManager; -import androidx.preference.PreferenceScreen; - public class AutomaticStorageManagementSwitchPreferenceController extends BasePreferenceController implements LifecycleObserver, OnResume, SwitchWidgetController.OnSwitchChangeListener { diff --git a/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java b/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java index f6eea3dbfc6..e6d9a724d94 100644 --- a/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java +++ b/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java @@ -21,13 +21,13 @@ import android.content.SharedPreferences; import android.provider.Settings; import android.util.SparseArray; +import androidx.annotation.VisibleForTesting; + import com.android.settingslib.applications.StorageStatsSource; import com.android.settingslib.deviceinfo.PrivateStorageInfo; import java.util.concurrent.TimeUnit; -import androidx.annotation.VisibleForTesting; - public class CachedStorageValuesHelper { @VisibleForTesting public static final String SHARED_PREFERENCES_NAME = "CachedStorageValues"; diff --git a/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java b/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java index 67d70e6ec2e..ee9fad6d52a 100644 --- a/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java +++ b/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java @@ -22,6 +22,12 @@ import android.graphics.drawable.Drawable; import android.os.UserManager; import android.util.SparseArray; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.settings.Utils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.deviceinfo.StorageItemPreference; @@ -30,12 +36,6 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.ArrayList; import java.util.List; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - /** * SecondaryUserController controls the preferences on the Storage screen which had to do with * secondary users. diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java index fa1e8e2b935..c63fe10fbfd 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java @@ -28,6 +28,11 @@ import android.os.storage.VolumeInfo; import android.util.Log; import android.util.SparseArray; +import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Settings; @@ -46,11 +51,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import androidx.annotation.VisibleForTesting; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * StorageItemPreferenceController handles the storage line items which summarize the storage * categorization breakdown. diff --git a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java index bf29612a830..a025d8c4daf 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java +++ b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java @@ -26,14 +26,14 @@ import android.util.AttributeSet; import android.view.View; import android.widget.Button; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; import com.android.settings.widget.DonutView; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - /** * StorageSummaryDonutPreference is a preference which summarizes the used and remaining storage left * on a given storage volume. It is visualized with a donut graphing the % used. diff --git a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java index 8e188d8986a..1a5152ed400 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java @@ -21,14 +21,14 @@ import android.os.storage.VolumeInfo; import android.text.TextUtils; import android.text.format.Formatter; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.deviceinfo.StorageVolumeProvider; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * StorgaeSummaryPreferenceController updates the donut storage summary preference to have the * correct sizes showing. diff --git a/src/com/android/settings/deviceinfo/storage/UserProfileController.java b/src/com/android/settings/deviceinfo/storage/UserProfileController.java index 00cdc02da82..887b1a7e95f 100644 --- a/src/com/android/settings/deviceinfo/storage/UserProfileController.java +++ b/src/com/android/settings/deviceinfo/storage/UserProfileController.java @@ -23,6 +23,9 @@ import android.os.Bundle; import android.os.storage.VolumeInfo; import android.util.SparseArray; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.util.Preconditions; import com.android.settings.Utils; @@ -32,9 +35,6 @@ import com.android.settings.deviceinfo.StorageItemPreference; import com.android.settings.deviceinfo.StorageProfileFragment; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * Defines a {@link AbstractPreferenceController} which handles a single profile of the primary * user. diff --git a/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java b/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java index 2d3de8179d8..d95befaa3ae 100644 --- a/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java +++ b/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java @@ -20,14 +20,14 @@ import android.app.usage.StorageStatsManager; import android.content.Context; import android.os.storage.VolumeInfo; +import androidx.annotation.VisibleForTesting; + import com.android.settingslib.deviceinfo.PrivateStorageInfo; import com.android.settingslib.deviceinfo.StorageVolumeProvider; import com.android.settingslib.utils.AsyncLoaderCompat; import java.io.IOException; -import androidx.annotation.VisibleForTesting; - public class VolumeSizesLoader extends AsyncLoaderCompat { private StorageVolumeProvider mVolumeProvider; private StorageStatsManager mStats; diff --git a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java index b3c182252f7..f845331f96e 100644 --- a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java +++ b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java @@ -14,6 +14,7 @@ package com.android.settings.display; import static android.provider.Settings.Secure.DOZE_ENABLED; + import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_AMBIENT_DISPLAY; import android.content.Context; @@ -21,14 +22,14 @@ import android.os.UserHandle; import android.provider.Settings; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.core.TogglePreferenceController; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - public class AmbientDisplayNotificationsPreferenceController extends TogglePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/AppGridView.java b/src/com/android/settings/display/AppGridView.java index d48eb09e22f..cda14458d0d 100644 --- a/src/com/android/settings/display/AppGridView.java +++ b/src/com/android/settings/display/AppGridView.java @@ -30,14 +30,14 @@ import android.widget.ArrayAdapter; import android.widget.GridView; import android.widget.ImageView; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import androidx.annotation.VisibleForTesting; - public class AppGridView extends GridView { public AppGridView(Context context) { super(context); diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java index 4c02cd6431d..c852c01f380 100644 --- a/src/com/android/settings/display/AutoRotatePreferenceController.java +++ b/src/com/android/settings/display/AutoRotatePreferenceController.java @@ -16,6 +16,8 @@ package com.android.settings.display; import android.content.Context; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.view.RotationPolicy; import com.android.settings.core.PreferenceControllerMixin; @@ -26,8 +28,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.preference.Preference; - public class AutoRotatePreferenceController extends TogglePreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/display/BatteryPercentagePreferenceController.java b/src/com/android/settings/display/BatteryPercentagePreferenceController.java index 50fbc649fb7..e1bbbfc58fa 100644 --- a/src/com/android/settings/display/BatteryPercentagePreferenceController.java +++ b/src/com/android/settings/display/BatteryPercentagePreferenceController.java @@ -20,13 +20,13 @@ import static android.provider.Settings.System.SHOW_BATTERY_PERCENT; import android.content.Context; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.internal.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerMixin; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - /** * A controller to manage the switch for showing battery percentage in the status bar. */ diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java index 5fd29d1ad14..05f43f650ac 100644 --- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java +++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java @@ -30,6 +30,10 @@ import android.provider.Settings.System; import android.service.vr.IVrManager; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -39,10 +43,6 @@ import com.android.settingslib.core.lifecycle.events.OnStop; import java.text.NumberFormat; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class BrightnessLevelPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop { diff --git a/src/com/android/settings/display/CameraGesturePreferenceController.java b/src/com/android/settings/display/CameraGesturePreferenceController.java index dddc02696c4..8e72a55227b 100644 --- a/src/com/android/settings/display/CameraGesturePreferenceController.java +++ b/src/com/android/settings/display/CameraGesturePreferenceController.java @@ -19,12 +19,12 @@ import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.core.AbstractPreferenceController; + public class CameraGesturePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/ColorModePreferenceController.java b/src/com/android/settings/display/ColorModePreferenceController.java index e85bbf9242c..3974f76e600 100644 --- a/src/com/android/settings/display/ColorModePreferenceController.java +++ b/src/com/android/settings/display/ColorModePreferenceController.java @@ -20,12 +20,12 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.internal.app.ColorDisplayController; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import androidx.annotation.VisibleForTesting; - public class ColorModePreferenceController extends BasePreferenceController { private static final String TAG = "ColorModePreference"; diff --git a/src/com/android/settings/display/ColorModePreferenceFragment.java b/src/com/android/settings/display/ColorModePreferenceFragment.java index 9b9f8bd5422..bf307b68b8d 100644 --- a/src/com/android/settings/display/ColorModePreferenceFragment.java +++ b/src/com/android/settings/display/ColorModePreferenceFragment.java @@ -17,6 +17,9 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.provider.SearchIndexableResource; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceScreen; + import com.android.internal.app.ColorDisplayController; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; @@ -31,9 +34,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceScreen; - @SuppressWarnings("WeakerAccess") @SearchIndexable public class ColorModePreferenceFragment extends RadioButtonPickerFragment diff --git a/src/com/android/settings/display/DarkUIPreferenceController.java b/src/com/android/settings/display/DarkUIPreferenceController.java index 2476f98dc8a..c3aafeefb5b 100644 --- a/src/com/android/settings/display/DarkUIPreferenceController.java +++ b/src/com/android/settings/display/DarkUIPreferenceController.java @@ -19,14 +19,14 @@ package com.android.settings.display; import android.app.UiModeManager; import android.content.Context; -import com.android.settings.R; -import com.android.settings.core.BasePreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; + public class DarkUIPreferenceController extends BasePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/LiftToWakePreferenceController.java b/src/com/android/settings/display/LiftToWakePreferenceController.java index e5462581c3e..d12b7c4c15d 100644 --- a/src/com/android/settings/display/LiftToWakePreferenceController.java +++ b/src/com/android/settings/display/LiftToWakePreferenceController.java @@ -20,12 +20,12 @@ import android.hardware.Sensor; import android.hardware.SensorManager; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.core.AbstractPreferenceController; + public class LiftToWakePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java index e988e3026f0..6421ebdbd4e 100644 --- a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java @@ -22,14 +22,14 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.app.ColorDisplayController; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.TogglePreferenceController; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class NightDisplayActivationPreferenceController extends TogglePreferenceController { private ColorDisplayController mController; diff --git a/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java b/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java index 6ccec7f0089..cfe17915fd6 100644 --- a/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java +++ b/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java @@ -18,14 +18,14 @@ package com.android.settings.display; import android.content.Context; -import com.android.internal.app.ColorDisplayController; -import com.android.settings.R; -import com.android.settings.core.BasePreferenceController; - import androidx.preference.DropDownPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.internal.app.ColorDisplayController; +import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; + public class NightDisplayAutoModePreferenceController extends BasePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java index cb2adc7ce48..e2abe1b24c8 100644 --- a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java +++ b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java @@ -18,11 +18,11 @@ package com.android.settings.display; import android.content.Context; +import androidx.preference.Preference; + import com.android.internal.app.ColorDisplayController; import com.android.settings.core.BasePreferenceController; -import androidx.preference.Preference; - public class NightDisplayCustomEndTimePreferenceController extends BasePreferenceController { private ColorDisplayController mController; diff --git a/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java b/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java index 75e8b8c55fb..255003c7011 100644 --- a/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java +++ b/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java @@ -18,11 +18,11 @@ package com.android.settings.display; import android.content.Context; +import androidx.preference.Preference; + import com.android.internal.app.ColorDisplayController; import com.android.settings.core.BasePreferenceController; -import androidx.preference.Preference; - public class NightDisplayCustomStartTimePreferenceController extends BasePreferenceController { private ColorDisplayController mController; diff --git a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java index 7465b489c9b..bb598590bc5 100644 --- a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java @@ -18,13 +18,13 @@ package com.android.settings.display; import android.content.Context; +import androidx.preference.Preference; + import com.android.internal.app.ColorDisplayController; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.widget.FooterPreference; -import androidx.preference.Preference; - public class NightDisplayFooterPreferenceController extends BasePreferenceController { public NightDisplayFooterPreferenceController(Context context) { diff --git a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java index 003accc4180..db053a596ff 100644 --- a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.display; import android.content.Context; import android.text.TextUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.app.ColorDisplayController; import com.android.settings.core.SliderPreferenceController; import com.android.settings.widget.SeekBarPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class NightDisplayIntensityPreferenceController extends SliderPreferenceController { private ColorDisplayController mController; diff --git a/src/com/android/settings/display/NightDisplayPreference.java b/src/com/android/settings/display/NightDisplayPreference.java index 41c6b5383fc..a84ba588816 100644 --- a/src/com/android/settings/display/NightDisplayPreference.java +++ b/src/com/android/settings/display/NightDisplayPreference.java @@ -17,12 +17,12 @@ package com.android.settings.display; import android.content.Context; import android.util.AttributeSet; +import androidx.preference.SwitchPreference; + import com.android.internal.app.ColorDisplayController; import java.time.LocalTime; -import androidx.preference.SwitchPreference; - public class NightDisplayPreference extends SwitchPreference implements ColorDisplayController.Callback { diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java index d322c1dd2aa..fbd5d3ef3a0 100644 --- a/src/com/android/settings/display/NightDisplaySettings.java +++ b/src/com/android/settings/display/NightDisplaySettings.java @@ -22,6 +22,8 @@ import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; +import androidx.preference.Preference; + import com.android.internal.app.ColorDisplayController; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -35,8 +37,6 @@ import java.time.LocalTime; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; - /** * Settings screen for Night display. */ diff --git a/src/com/android/settings/display/NightModePreferenceController.java b/src/com/android/settings/display/NightModePreferenceController.java index 65120e7891e..5846a658346 100644 --- a/src/com/android/settings/display/NightModePreferenceController.java +++ b/src/com/android/settings/display/NightModePreferenceController.java @@ -19,13 +19,13 @@ import android.app.UiModeManager; import android.content.Context; import android.util.Log; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; - import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.core.AbstractPreferenceController; + public class NightModePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/ScreenSaverPreferenceController.java b/src/com/android/settings/display/ScreenSaverPreferenceController.java index a172a394575..c1b0b4e9eb6 100644 --- a/src/com/android/settings/display/ScreenSaverPreferenceController.java +++ b/src/com/android/settings/display/ScreenSaverPreferenceController.java @@ -15,12 +15,12 @@ package com.android.settings.display; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.dream.DreamSettings; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; - public class ScreenSaverPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/display/ScreenZoomPreference.java b/src/com/android/settings/display/ScreenZoomPreference.java index 6e401814927..f47d7da4384 100644 --- a/src/com/android/settings/display/ScreenZoomPreference.java +++ b/src/com/android/settings/display/ScreenZoomPreference.java @@ -20,11 +20,11 @@ import android.content.Context; import android.text.TextUtils; import android.util.AttributeSet; -import com.android.settingslib.display.DisplayDensityUtils; - import androidx.core.content.res.TypedArrayUtils; import androidx.preference.Preference; +import com.android.settingslib.display.DisplayDensityUtils; + /** * Preference for changing the density of the display on which the preference * is visible. diff --git a/src/com/android/settings/display/ShowOperatorNamePreferenceController.java b/src/com/android/settings/display/ShowOperatorNamePreferenceController.java index 7af3351ad37..40eaad330d0 100644 --- a/src/com/android/settings/display/ShowOperatorNamePreferenceController.java +++ b/src/com/android/settings/display/ShowOperatorNamePreferenceController.java @@ -16,13 +16,13 @@ package com.android.settings.display; import android.content.Context; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - public class ShowOperatorNamePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/TapToWakePreferenceController.java b/src/com/android/settings/display/TapToWakePreferenceController.java index da8e78564d1..5c2d97530da 100644 --- a/src/com/android/settings/display/TapToWakePreferenceController.java +++ b/src/com/android/settings/display/TapToWakePreferenceController.java @@ -16,12 +16,12 @@ package com.android.settings.display; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.core.AbstractPreferenceController; + public class TapToWakePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/ThemePreferenceController.java b/src/com/android/settings/display/ThemePreferenceController.java index c71a7abf498..6fc4b08bf00 100644 --- a/src/com/android/settings/display/ThemePreferenceController.java +++ b/src/com/android/settings/display/ThemePreferenceController.java @@ -26,6 +26,10 @@ import android.os.ServiceManager; import android.os.UserHandle; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; @@ -36,10 +40,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import androidx.annotation.VisibleForTesting; -import androidx.preference.ListPreference; -import androidx.preference.Preference; - public class ThemePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/TimeoutListPreference.java b/src/com/android/settings/display/TimeoutListPreference.java index 34b2e11fe0c..f9a731d32eb 100644 --- a/src/com/android/settings/display/TimeoutListPreference.java +++ b/src/com/android/settings/display/TimeoutListPreference.java @@ -26,14 +26,14 @@ import android.util.AttributeSet; import android.util.Log; import android.view.View; +import androidx.appcompat.app.AlertDialog.Builder; + import com.android.settings.R; import com.android.settings.RestrictedListPreference; import com.android.settingslib.RestrictedLockUtils; import java.util.ArrayList; -import androidx.appcompat.app.AlertDialog.Builder; - public class TimeoutListPreference extends RestrictedListPreference { private static final String TAG = "TimeoutListPreference"; diff --git a/src/com/android/settings/display/TimeoutPreferenceController.java b/src/com/android/settings/display/TimeoutPreferenceController.java index 2fbe388bcb9..c06816838b3 100644 --- a/src/com/android/settings/display/TimeoutPreferenceController.java +++ b/src/com/android/settings/display/TimeoutPreferenceController.java @@ -22,14 +22,14 @@ import android.os.UserManager; import android.provider.Settings; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; - public class TimeoutPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/VrDisplayPreferenceController.java b/src/com/android/settings/display/VrDisplayPreferenceController.java index 1c9562c75da..6fcb5b0bc17 100644 --- a/src/com/android/settings/display/VrDisplayPreferenceController.java +++ b/src/com/android/settings/display/VrDisplayPreferenceController.java @@ -18,12 +18,12 @@ import android.content.Context; import android.content.pm.PackageManager; import android.provider.Settings; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; - public class VrDisplayPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/display/WallpaperPreferenceController.java b/src/com/android/settings/display/WallpaperPreferenceController.java index 60068e3a33b..8e290046ef6 100644 --- a/src/com/android/settings/display/WallpaperPreferenceController.java +++ b/src/com/android/settings/display/WallpaperPreferenceController.java @@ -24,6 +24,8 @@ import android.os.UserHandle; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedLockUtils; @@ -32,8 +34,6 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.List; -import androidx.preference.Preference; - public class WallpaperPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/dream/CurrentDreamPreferenceController.java b/src/com/android/settings/dream/CurrentDreamPreferenceController.java index 880cb8c0d8d..fee4826c5a9 100644 --- a/src/com/android/settings/dream/CurrentDreamPreferenceController.java +++ b/src/com/android/settings/dream/CurrentDreamPreferenceController.java @@ -18,6 +18,8 @@ package com.android.settings.dream; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.core.BasePreferenceController; import com.android.settings.widget.GearPreference; import com.android.settingslib.dream.DreamBackend; @@ -25,8 +27,6 @@ import com.android.settingslib.dream.DreamBackend.DreamInfo; import java.util.Optional; -import androidx.preference.Preference; - public class CurrentDreamPreferenceController extends BasePreferenceController { private final DreamBackend mBackend; diff --git a/src/com/android/settings/dream/DreamSettings.java b/src/com/android/settings/dream/DreamSettings.java index 9a46b1e04d8..32869f80690 100644 --- a/src/com/android/settings/dream/DreamSettings.java +++ b/src/com/android/settings/dream/DreamSettings.java @@ -24,6 +24,8 @@ import static com.android.settingslib.dream.DreamBackend.WHILE_DOCKED; import android.content.Context; import android.provider.SearchIndexableResource; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; @@ -37,8 +39,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import androidx.annotation.VisibleForTesting; - @SearchIndexable public class DreamSettings extends DashboardFragment { diff --git a/src/com/android/settings/dream/StartNowPreferenceController.java b/src/com/android/settings/dream/StartNowPreferenceController.java index 124e48575a9..5519a0efc49 100644 --- a/src/com/android/settings/dream/StartNowPreferenceController.java +++ b/src/com/android/settings/dream/StartNowPreferenceController.java @@ -19,15 +19,15 @@ package com.android.settings.dream; import android.content.Context; import android.widget.Button; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.dream.DreamBackend; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class StartNowPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { private static final String TAG = "StartNowPreferenceController"; diff --git a/src/com/android/settings/dream/WhenToDreamPreferenceController.java b/src/com/android/settings/dream/WhenToDreamPreferenceController.java index b57d064994e..4108e850538 100644 --- a/src/com/android/settings/dream/WhenToDreamPreferenceController.java +++ b/src/com/android/settings/dream/WhenToDreamPreferenceController.java @@ -18,12 +18,12 @@ package com.android.settings.dream; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.dream.DreamBackend; -import androidx.preference.Preference; - public class WhenToDreamPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java index 6a4ca92bb30..52bd4f5509e 100644 --- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java +++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java @@ -32,6 +32,9 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; + import com.android.settings.R; import com.android.settings.Settings; import com.android.settings.Utils; @@ -41,9 +44,6 @@ import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import java.util.Objects; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; - /** * Helper class for {@link ActionDisabledByAdminDialog} which sets up the dialog. */ diff --git a/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java index 954c643ac69..1c7ff620c3c 100644 --- a/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java @@ -17,6 +17,8 @@ package com.android.settings.enterprise; import android.content.Context; import android.text.format.DateUtils; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; @@ -24,8 +26,6 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.Date; -import androidx.preference.Preference; - public abstract class AdminActionPreferenceControllerBase extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java index c438e663e0d..86d08cb674d 100644 --- a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java @@ -17,14 +17,14 @@ package com.android.settings.enterprise; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; - public abstract class AdminGrantedPermissionsPreferenceControllerBase extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java index d523e3be09a..696561bad8c 100644 --- a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java +++ b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java @@ -15,13 +15,13 @@ package com.android.settings.enterprise; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; - public class AlwaysOnVpnCurrentUserPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java index a12b62cd1d9..3170dac364d 100644 --- a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java +++ b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java @@ -20,6 +20,9 @@ import android.content.Context; import android.content.pm.PackageManager; import android.util.IconDrawableFactory; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.applications.UserAppInfo; @@ -29,9 +32,6 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * PreferenceController that builds a dynamic list of applications provided by * {@link ApplicationListBuilder} instance. diff --git a/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java index 5a24ab8b5db..45170b3842f 100644 --- a/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java +++ b/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java @@ -16,11 +16,11 @@ package com.android.settings.enterprise; import android.content.Context; -import com.android.settings.R; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; +import com.android.settings.R; + public class CaCertsCurrentUserPreferenceController extends CaCertsPreferenceControllerBase { @VisibleForTesting diff --git a/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java b/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java index 411140c6012..c7dde5cc462 100644 --- a/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java @@ -16,13 +16,13 @@ package com.android.settings.enterprise; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; - public abstract class CaCertsPreferenceControllerBase extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java index b3d5297364e..9bd4279db3f 100644 --- a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java @@ -15,14 +15,14 @@ package com.android.settings.enterprise; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; - public class EnterpriseInstalledPackagesPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java index c5da685b142..b07eb911143 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java @@ -15,13 +15,13 @@ package com.android.settings.enterprise; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; - public class EnterprisePrivacyPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java index 650871f541d..e3136f4a5c1 100644 --- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java @@ -22,6 +22,11 @@ import android.content.pm.PackageManager; import android.content.pm.UserInfo; import android.os.UserHandle; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.ApplicationFeatureProvider; @@ -38,11 +43,6 @@ import java.util.Collections; import java.util.EnumMap; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - /** * PreferenceController that builds a dynamic list of default apps set by device or profile owner. diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java index eed6ba1dc90..b2f9459d8a3 100644 --- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java @@ -17,6 +17,8 @@ package com.android.settings.enterprise; import android.content.Context; import android.os.UserHandle; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.applications.EnterpriseDefaultApps; @@ -25,8 +27,6 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settings.users.UserFeatureProvider; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; - public class EnterpriseSetDefaultAppsPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java index 9c5906f3129..322589ea3f9 100644 --- a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java @@ -16,13 +16,13 @@ package com.android.settings.enterprise; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; - public abstract class FailedPasswordWipePreferenceControllerBase extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/enterprise/ImePreferenceController.java b/src/com/android/settings/enterprise/ImePreferenceController.java index 3d2ed805d62..51a24a27620 100644 --- a/src/com/android/settings/enterprise/ImePreferenceController.java +++ b/src/com/android/settings/enterprise/ImePreferenceController.java @@ -16,13 +16,13 @@ package com.android.settings.enterprise; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; - public class ImePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/flashlight/FlashlightSliceBuilder.java b/src/com/android/settings/flashlight/FlashlightSliceBuilder.java index d4309ca66d0..d21739ebbcd 100644 --- a/src/com/android/settings/flashlight/FlashlightSliceBuilder.java +++ b/src/com/android/settings/flashlight/FlashlightSliceBuilder.java @@ -17,6 +17,7 @@ package com.android.settings.flashlight; import static android.app.slice.Slice.EXTRA_TOGGLE_STATE; + import static androidx.slice.builders.ListBuilder.ICON_IMAGE; import android.annotation.ColorInt; @@ -34,17 +35,17 @@ import android.provider.Settings.Secure; import android.provider.SettingsSlicesContract; import android.util.Log; -import com.android.settings.R; -import com.android.settings.Utils; -import com.android.settings.slices.SettingsSliceProvider; -import com.android.settings.slices.SliceBroadcastReceiver; - import androidx.core.graphics.drawable.IconCompat; import androidx.slice.Slice; import androidx.slice.builders.ListBuilder; import androidx.slice.builders.ListBuilder.RowBuilder; import androidx.slice.builders.SliceAction; +import com.android.settings.R; +import com.android.settings.Utils; +import com.android.settings.slices.SettingsSliceProvider; +import com.android.settings.slices.SliceBroadcastReceiver; + /** * Utility class to build a Flashlight Slice, and handle all associated actions. diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java index 2c48c3d971f..e34e6224406 100644 --- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java @@ -29,6 +29,9 @@ import android.text.TextUtils; import android.util.Log; import android.view.View; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; @@ -53,11 +56,6 @@ import com.android.settingslib.utils.StringUtil; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.Loader; -import androidx.preference.Preference; - /** * Power usage detail fragment for each app, this fragment contains * diff --git a/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java b/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java index 8ec877a23cd..26fd3985156 100644 --- a/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java +++ b/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java @@ -18,12 +18,12 @@ package com.android.settings.fuelgauge; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.BasePreferenceController; -import com.android.settings.overlay.FeatureFactory; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.BasePreferenceController; +import com.android.settings.overlay.FeatureFactory; + /** * Controller to change and update the auto restriction toggle */ diff --git a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java index 2a53f9f8e1b..4a5ce7db908 100644 --- a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java @@ -19,6 +19,9 @@ import android.app.admin.DevicePolicyManager; import android.content.Context; import android.os.UserManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.InstrumentedPreferenceFragment; @@ -32,9 +35,6 @@ import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.fuelgauge.PowerWhitelistBackend; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - /** * Controller to control whether an app can run in the background */ diff --git a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java index 7f0cb88fa98..2d95c312b0a 100644 --- a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java @@ -33,6 +33,11 @@ import android.util.ArrayMap; import android.util.Log; import android.util.SparseArray; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.internal.os.BatterySipper; import com.android.internal.os.BatterySipper.DrainType; import com.android.internal.os.BatteryStatsHelper; @@ -51,11 +56,6 @@ import com.android.settingslib.utils.StringUtil; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - /** * Controller that update the battery header view */ diff --git a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java index 7a583d8b56e..b5c39a1f697 100644 --- a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java +++ b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java @@ -22,14 +22,14 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.PowerManager; +import androidx.annotation.IntDef; +import androidx.annotation.VisibleForTesting; + import com.android.settings.Utils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import androidx.annotation.IntDef; -import androidx.annotation.VisibleForTesting; - /** * Use this broadcastReceiver to listen to the battery change, and it will invoke * {@link OnBatteryChangedListener} if any of the following has been changed: diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java index ef30ce6adf2..e5a2e5e0ca2 100644 --- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java @@ -25,21 +25,20 @@ import android.os.BatteryManager; import android.os.PowerManager; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.Utils; -import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.PreferenceScreen; - /** * Controller that update the battery header view */ diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java index 115e72c0f07..faca9fbcb67 100644 --- a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java +++ b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java @@ -21,14 +21,14 @@ import android.util.AttributeSet; import android.view.View; import android.widget.TextView; -import com.android.internal.os.BatteryStatsHelper; -import com.android.settings.R; -import com.android.settings.widget.UsageView; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.internal.os.BatteryStatsHelper; +import com.android.settings.R; +import com.android.settings.widget.UsageView; + /** * Custom preference for displaying power consumption as a bar and an icon on the left for the * subsystem/app type. diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java index dcbfaa85a8b..06cdad6a68e 100644 --- a/src/com/android/settings/fuelgauge/BatteryInfo.java +++ b/src/com/android/settings/fuelgauge/BatteryInfo.java @@ -27,6 +27,8 @@ import android.os.SystemClock; import android.text.format.Formatter; import android.util.SparseIntArray; +import androidx.annotation.WorkerThread; + import com.android.internal.os.BatteryStatsHelper; import com.android.settings.Utils; import com.android.settings.overlay.FeatureFactory; @@ -35,8 +37,6 @@ import com.android.settingslib.R; import com.android.settingslib.utils.PowerUtil; import com.android.settingslib.utils.StringUtil; -import androidx.annotation.WorkerThread; - public class BatteryInfo { public CharSequence chargeLabel; diff --git a/src/com/android/settings/fuelgauge/BatteryInfoLoader.java b/src/com/android/settings/fuelgauge/BatteryInfoLoader.java index b7ebaf9bb8a..cd87612ea7b 100644 --- a/src/com/android/settings/fuelgauge/BatteryInfoLoader.java +++ b/src/com/android/settings/fuelgauge/BatteryInfoLoader.java @@ -17,11 +17,11 @@ package com.android.settings.fuelgauge; import android.content.Context; +import androidx.annotation.VisibleForTesting; + import com.android.internal.os.BatteryStatsHelper; import com.android.settingslib.utils.AsyncLoaderCompat; -import androidx.annotation.VisibleForTesting; - /** * Loader that can be used by classes to load BatteryInfo in a background thread. This loader will * automatically grab enhanced battery estimates if available or fall back to the system estimate diff --git a/src/com/android/settings/fuelgauge/BatteryMeterView.java b/src/com/android/settings/fuelgauge/BatteryMeterView.java index 3c235f57f17..822f0e9a190 100644 --- a/src/com/android/settings/fuelgauge/BatteryMeterView.java +++ b/src/com/android/settings/fuelgauge/BatteryMeterView.java @@ -25,12 +25,12 @@ import android.graphics.PorterDuffColorFilter; import android.util.AttributeSet; import android.widget.ImageView; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.graph.BatteryMeterDrawableBase; -import androidx.annotation.VisibleForTesting; - public class BatteryMeterView extends ImageView { @VisibleForTesting BatteryMeterDrawable mDrawable; diff --git a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java index 8baf2722acf..7e003074ca9 100644 --- a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java @@ -16,6 +16,9 @@ package com.android.settings.fuelgauge; import android.os.Bundle; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.Settings; import com.android.settings.SettingsActivity; @@ -26,9 +29,6 @@ import com.android.settings.dashboard.DashboardFragment; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.fuelgauge.PowerWhitelistBackend; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - /** * Controller that jumps to high power optimization fragment */ diff --git a/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java b/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java index 7369ed8b38e..5de83d3f429 100644 --- a/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java +++ b/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java @@ -19,11 +19,11 @@ package com.android.settings.fuelgauge; import android.content.Context; import android.os.UserManager; +import androidx.annotation.VisibleForTesting; + import com.android.internal.os.BatteryStatsHelper; import com.android.settingslib.utils.AsyncLoaderCompat; -import androidx.annotation.VisibleForTesting; - /** * Loader to get new {@link BatteryStatsHelper} in the background */ diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java index 3676761af78..c0712842706 100644 --- a/src/com/android/settings/fuelgauge/BatteryUtils.java +++ b/src/com/android/settings/fuelgauge/BatteryUtils.java @@ -34,10 +34,14 @@ import android.text.format.DateUtils; import android.util.Log; import android.util.SparseLongArray; +import androidx.annotation.IntDef; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; +import androidx.annotation.WorkerThread; + import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; import com.android.internal.util.ArrayUtils; -import com.android.settings.R; import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper; import com.android.settings.fuelgauge.batterytip.AnomalyInfo; import com.android.settings.fuelgauge.batterytip.BatteryDatabaseManager; @@ -53,12 +57,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import androidx.annotation.IntDef; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; -import androidx.annotation.VisibleForTesting; -import androidx.annotation.WorkerThread; - /** * Utils for battery operation */ diff --git a/src/com/android/settings/fuelgauge/HighPowerDetail.java b/src/com/android/settings/fuelgauge/HighPowerDetail.java index f5df452c333..31029735987 100644 --- a/src/com/android/settings/fuelgauge/HighPowerDetail.java +++ b/src/com/android/settings/fuelgauge/HighPowerDetail.java @@ -28,6 +28,10 @@ import android.view.View; import android.widget.Checkable; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.AppInfoBase; @@ -36,10 +40,6 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.fuelgauge.PowerWhitelistBackend; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; - public class HighPowerDetail extends InstrumentedDialogFragment implements OnClickListener, View.OnClickListener { diff --git a/src/com/android/settings/fuelgauge/InactiveApps.java b/src/com/android/settings/fuelgauge/InactiveApps.java index 655a1b778da..cb419ca253b 100644 --- a/src/com/android/settings/fuelgauge/InactiveApps.java +++ b/src/com/android/settings/fuelgauge/InactiveApps.java @@ -31,16 +31,16 @@ import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.os.Bundle; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import java.util.List; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; - public class InactiveApps extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/fuelgauge/PowerGaugePreference.java b/src/com/android/settings/fuelgauge/PowerGaugePreference.java index bfa0a780462..a2ceb67cab7 100644 --- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java +++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java @@ -22,12 +22,12 @@ import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.widget.AppPreference; -import androidx.preference.PreferenceViewHolder; - /** * Custom preference for displaying battery usage info as a bar and an icon on * the left for the subsystem/app type. diff --git a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java index 9e9e7aff94d..a4ae1ac98a4 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java +++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java @@ -25,6 +25,8 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -37,8 +39,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import androidx.annotation.VisibleForTesting; - @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class PowerUsageAdvanced extends PowerUsageBase { private static final String TAG = "AdvancedBatteryUsage"; diff --git a/src/com/android/settings/fuelgauge/PowerUsageBase.java b/src/com/android/settings/fuelgauge/PowerUsageBase.java index a11270befb7..ec73b1b57a8 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageBase.java +++ b/src/com/android/settings/fuelgauge/PowerUsageBase.java @@ -23,13 +23,13 @@ import android.os.Bundle; import android.os.UserManager; import android.view.Menu; -import com.android.internal.os.BatteryStatsHelper; -import com.android.settings.dashboard.DashboardFragment; - import androidx.annotation.VisibleForTesting; import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; +import com.android.internal.os.BatteryStatsHelper; +import com.android.settings.dashboard.DashboardFragment; + /** * Common base class for things that need to show the battery usage graph. */ diff --git a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java index 64489eaf7e2..d3c1d54e1af 100644 --- a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java +++ b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java @@ -21,6 +21,9 @@ import android.app.AppOpsManager; import android.content.Context; import android.os.UserManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.InstrumentedPreferenceFragment; @@ -29,9 +32,6 @@ import com.android.settings.fuelgauge.batterytip.BatteryTipUtils; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - /** * Controller to change and update the smart battery toggle */ diff --git a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java index b64a70775ed..0906a5d9258 100644 --- a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java +++ b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java @@ -25,6 +25,11 @@ import android.util.IconDrawableFactory; import android.util.Log; import android.util.SparseLongArray; +import androidx.annotation.VisibleForTesting; +import androidx.preference.CheckBoxPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; @@ -46,11 +51,6 @@ import com.android.settingslib.widget.FooterPreferenceMixinCompat; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.CheckBoxPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; - /** * Fragment to show a list of anomaly apps, where user could handle these anomalies */ diff --git a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java index 0e8281de754..af49f3d9541 100644 --- a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java +++ b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java @@ -21,12 +21,12 @@ import android.content.Context; import android.provider.Settings; import android.text.TextUtils; -import com.android.settings.core.BasePreferenceController; -import com.android.settings.overlay.FeatureFactory; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.BasePreferenceController; +import com.android.settings.overlay.FeatureFactory; + /** * Controller to change and update the smart battery toggle */ diff --git a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java index ad916ee4bd3..c0ecbf9fb29 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java @@ -18,12 +18,12 @@ package com.android.settings.fuelgauge.batterysaver; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.TogglePreferenceController; -import com.android.settingslib.fuelgauge.BatterySaverUtils; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; +import com.android.settings.core.TogglePreferenceController; +import com.android.settingslib.fuelgauge.BatterySaverUtils; + /** * Controller that update whether to turn on battery saver automatically */ diff --git a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java index 63bd6977364..0fbba0b2d70 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java @@ -25,6 +25,10 @@ import android.provider.Settings; import android.util.Log; import android.view.accessibility.AccessibilityNodeInfo; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.BasePreferenceController; @@ -34,10 +38,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * Controller that update the battery saver seekbar */ diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java index 00b890d24df..80a72e67f71 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java @@ -19,6 +19,9 @@ package com.android.settings.fuelgauge.batterysaver; import android.content.Context; import android.os.PowerManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.TogglePreferenceController; import com.android.settings.fuelgauge.BatterySaverReceiver; import com.android.settings.widget.TwoStateButtonPreference; @@ -27,9 +30,6 @@ import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; import com.android.settingslib.fuelgauge.BatterySaverUtils; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * Controller to update the battery saver button */ diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java index 60d1c9561ac..bb73142b9be 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java @@ -24,13 +24,13 @@ import android.content.ComponentName; import android.content.Context; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settingslib.utils.ThreadUtils; import java.util.concurrent.TimeUnit; -import androidx.annotation.VisibleForTesting; - /** A JobService to clean up obsolete data in anomaly database */ public class AnomalyCleanupJobService extends JobService { private static final String TAG = "AnomalyCleanUpJobService"; diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java index 0a19addb07c..ad02c3a75b6 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java @@ -29,13 +29,13 @@ import android.text.TextUtils; import android.util.Base64; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settingslib.utils.ThreadUtils; import java.util.concurrent.TimeUnit; -import androidx.annotation.VisibleForTesting; - /** A JobService check whether to update the anomaly config periodically */ public class AnomalyConfigJobService extends JobService { private static final String TAG = "AnomalyConfigJobService"; diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java index bd1633faf5d..349a419ea27 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java @@ -21,11 +21,11 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.util.Log; +import androidx.annotation.IntDef; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import androidx.annotation.IntDef; - /** * Database controls the anomaly logging(e.g. packageName, anomalyType and time) */ diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java index 70cdf928950..b3be061dd7a 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java @@ -37,6 +37,9 @@ import android.provider.Settings; import android.util.Log; import android.util.Pair; +import androidx.annotation.GuardedBy; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.util.ArrayUtils; import com.android.settings.R; @@ -51,9 +54,6 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -import androidx.annotation.GuardedBy; -import androidx.annotation.VisibleForTesting; - /** A JobService to store anomaly data to anomaly database */ public class AnomalyDetectionJobService extends JobService { private static final String TAG = "AnomalyDetectionService"; diff --git a/src/com/android/settings/fuelgauge/batterytip/AppInfo.java b/src/com/android/settings/fuelgauge/batterytip/AppInfo.java index 73d3b863615..e79b8745196 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AppInfo.java +++ b/src/com/android/settings/fuelgauge/batterytip/AppInfo.java @@ -21,10 +21,10 @@ import android.os.Parcelable; import android.text.TextUtils; import android.util.ArraySet; -import java.util.Objects; - import androidx.annotation.VisibleForTesting; +import java.util.Objects; + /** * Model class stores app info(e.g. package name, type..) that used in battery tip */ diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryDatabaseManager.java b/src/com/android/settings/fuelgauge/batterytip/BatteryDatabaseManager.java index 513244e39de..5fa952c4338 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryDatabaseManager.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryDatabaseManager.java @@ -39,15 +39,15 @@ import android.text.TextUtils; import android.util.ArrayMap; import android.util.SparseLongArray; +import androidx.annotation.VisibleForTesting; + +import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.ActionColumns; + import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; -import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.ActionColumns; - -import androidx.annotation.VisibleForTesting; - /** * Database manager for battery data. Now it only contains anomaly data stored in {@link AppInfo}. * diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java index 1043a8e1e1e..9565036bfc8 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java @@ -21,14 +21,14 @@ import android.content.Context; import android.os.UserManager; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.fuelgauge.PowerUsageFeatureProvider; import com.android.settings.overlay.FeatureFactory; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - /** * Preference controller to control the battery manager */ diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java index 66d9f2cf342..dc7983547c3 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java @@ -22,6 +22,11 @@ import android.content.DialogInterface; import android.os.Bundle; import android.view.LayoutInflater; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -37,11 +42,6 @@ import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - /** * Dialog Fragment to show action dialog for each anomaly */ diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java index 916ee85daea..aa66aed8c61 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java @@ -18,6 +18,8 @@ package com.android.settings.fuelgauge.batterytip; import android.content.Context; +import androidx.annotation.VisibleForTesting; + import com.android.internal.os.BatteryStatsHelper; import com.android.settings.fuelgauge.BatteryInfo; import com.android.settings.fuelgauge.BatteryUtils; @@ -37,8 +39,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import androidx.annotation.VisibleForTesting; - /** * Loader to compute and return a battery tip list. It will always return a full length list even * though some tips may have state {@code BaseBatteryTip.StateType.INVISIBLE}. diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java index 4bd8cd73c9f..487adf859d4 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java @@ -21,10 +21,10 @@ import android.provider.Settings; import android.util.KeyValueListParser; import android.util.Log; -import java.time.Duration; - import androidx.annotation.VisibleForTesting; +import java.time.Duration; + /** * Class to store the policy for battery tips, which comes from * {@link Settings.Global} diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java index 158ffd47382..eac2bf5c2f6 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java @@ -19,6 +19,11 @@ package com.android.settings.fuelgauge.batterytip; import android.content.Context; import android.os.Bundle; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.settings.SettingsActivity; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.InstrumentedPreferenceFragment; @@ -33,11 +38,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - /** * Controller in charge of the battery tip group */ diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java index 8debf6bcd4a..ed06cce59d1 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java @@ -24,6 +24,8 @@ import android.content.Intent; import android.os.UserHandle; import android.os.UserManager; +import androidx.annotation.NonNull; + import com.android.internal.util.CollectionUtils; import com.android.settings.SettingsActivity; import com.android.settings.core.InstrumentedPreferenceFragment; @@ -43,8 +45,6 @@ import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip; import java.util.ArrayList; import java.util.List; -import androidx.annotation.NonNull; - /** * Utility class for {@link BatteryTip} */ diff --git a/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java b/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java index 831226c6ca5..d832640736a 100644 --- a/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java +++ b/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java @@ -26,14 +26,14 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.utils.StringUtil; import java.util.List; -import androidx.recyclerview.widget.RecyclerView; - /** * Adapter for the high usage app list */ diff --git a/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java b/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java index c246f0a5831..a0449f2e09e 100644 --- a/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java +++ b/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java @@ -16,11 +16,11 @@ package com.android.settings.fuelgauge.batterytip; +import androidx.annotation.IntDef; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import androidx.annotation.IntDef; - /** * This class provides all the configs needed if we want to use {@link android.app.StatsManager} */ diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentAction.java index 98d6dcc96de..9d35615840a 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentAction.java @@ -16,6 +16,8 @@ package com.android.settings.fuelgauge.batterytip.actions; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.fuelgauge.RestrictedAppDetails; @@ -27,8 +29,6 @@ import com.android.settingslib.utils.ThreadUtils; import java.util.List; -import androidx.annotation.VisibleForTesting; - /** * Action to open the {@link com.android.settings.fuelgauge.RestrictedAppDetails} */ diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java index 390515672ac..ac946df571d 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java @@ -20,6 +20,8 @@ import android.app.AppOpsManager; import android.content.Context; import android.util.Pair; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.util.CollectionUtils; import com.android.settings.fuelgauge.BatteryUtils; @@ -30,8 +32,6 @@ import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip; import java.util.List; -import androidx.annotation.VisibleForTesting; - /** * Action to restrict the apps, then app is not allowed to run in the background. */ diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java index ba650289918..10a09c54f53 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java @@ -16,6 +16,8 @@ package com.android.settings.fuelgauge.batterytip.actions; +import androidx.fragment.app.Fragment; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -23,8 +25,6 @@ import com.android.settings.core.SubSettingLauncher; import com.android.settings.fuelgauge.SmartBatterySettings; import com.android.settingslib.core.instrumentation.Instrumentable; -import androidx.fragment.app.Fragment; - public class SmartBatteryAction extends BatteryTipAction { private SettingsActivity mSettingsActivity; private Fragment mFragment; diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java index 8a371efd38a..419e0431345 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java @@ -20,13 +20,13 @@ import android.app.AppOpsManager; import android.content.Context; import android.util.Pair; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip; -import androidx.annotation.VisibleForTesting; - /** * Action to clear the restriction to the app */ diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java index c67b2a834eb..13ba5f6bcfe 100644 --- a/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java +++ b/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java @@ -20,6 +20,8 @@ import android.content.Context; import android.os.BatteryStats; import android.text.format.DateUtils; +import androidx.annotation.VisibleForTesting; + import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.fuelgauge.BatteryInfo; @@ -35,8 +37,6 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; -import androidx.annotation.VisibleForTesting; - /** * Detector whether to show summary tip. This detector should be executed as the last * {@link BatteryTipDetector} since it need the most up-to-date {@code visibleTips} diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java index e6c08371cd5..63bb97784ce 100644 --- a/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java +++ b/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java @@ -17,7 +17,8 @@ package com.android.settings.fuelgauge.batterytip.detectors; import android.content.Context; -import android.text.format.DateUtils; + +import androidx.annotation.VisibleForTesting; import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper; import com.android.settings.fuelgauge.batterytip.AppInfo; @@ -33,8 +34,6 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -import androidx.annotation.VisibleForTesting; - /** * Detector whether to show summary tip. This detector should be executed as the last * {@link BatteryTipDetector} since it need the most up-to-date {@code visibleTips} diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java index 1d5143f624a..841a27ea63c 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java @@ -21,16 +21,16 @@ import android.os.Parcel; import android.os.Parcelable; import android.util.SparseIntArray; -import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - import androidx.annotation.IdRes; import androidx.annotation.IntDef; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; +import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + /** * Base model for a battery tip(e.g. suggest user to turn on battery saver) * diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java index b308e1bb81f..356097dfbda 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java @@ -20,6 +20,8 @@ import android.content.Context; import android.os.Parcel; import android.os.Parcelable; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.fuelgauge.batterytip.AppInfo; @@ -27,8 +29,6 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import java.util.List; -import androidx.annotation.VisibleForTesting; - /** * Tip to show general summary about battery life */ diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java index 0d91c7437d6..4ff0d28cd6f 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java @@ -22,6 +22,8 @@ import android.icu.text.ListFormatter; import android.os.Parcel; import android.util.Pair; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; @@ -31,8 +33,6 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; - /** * Tip to suggest user to restrict some bad apps */ diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java index e7f523064e8..0e2e8b59ffa 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java @@ -20,12 +20,12 @@ import android.content.Context; import android.os.Parcel; import android.os.Parcelable; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; -import androidx.annotation.VisibleForTesting; - /** * Tip to show general summary about battery life */ diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTip.java index 9964f05d391..a0e470f5c41 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTip.java @@ -19,11 +19,11 @@ package com.android.settings.fuelgauge.batterytip.tips; import android.content.Context; import android.os.Parcel; +import androidx.annotation.VisibleForTesting; + import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; -import androidx.annotation.VisibleForTesting; - /** * Tip to suggest user to remove app restriction. This is the empty tip and it is only used in * {@link com.android.settings.fuelgauge.AdvancedPowerUsageDetail} to create dialog. diff --git a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java index 4a2357024c3..9f0a613424b 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java @@ -25,10 +25,10 @@ import android.os.UserHandle; import android.provider.Settings; import android.text.TextUtils; -import com.android.internal.hardware.AmbientDisplayConfiguration; - import androidx.annotation.VisibleForTesting; +import com.android.internal.hardware.AmbientDisplayConfiguration; + public class DoubleTapScreenPreferenceController extends GesturePreferenceController { private final int ON = 1; diff --git a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java index fe8aa5701bf..d4c63c0a76b 100644 --- a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java @@ -26,11 +26,11 @@ import android.os.UserManager; import android.provider.Settings; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.Utils; -import androidx.annotation.VisibleForTesting; - public class DoubleTwistPreferenceController extends GesturePreferenceController { private final int ON = 1; diff --git a/src/com/android/settings/gestures/GesturePreferenceController.java b/src/com/android/settings/gestures/GesturePreferenceController.java index 7b649e17038..a4274bf7417 100644 --- a/src/com/android/settings/gestures/GesturePreferenceController.java +++ b/src/com/android/settings/gestures/GesturePreferenceController.java @@ -19,6 +19,10 @@ package com.android.settings.gestures; import android.content.Context; import android.os.Bundle; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.widget.VideoPreference; @@ -28,10 +32,6 @@ import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public abstract class GesturePreferenceController extends TogglePreferenceController implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause, OnCreate, OnSaveInstanceState { diff --git a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java index 1074be03556..069085bd451 100644 --- a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java +++ b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java @@ -20,6 +20,8 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; +import androidx.annotation.NonNull; + import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; @@ -29,8 +31,6 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.ArrayList; import java.util.List; -import androidx.annotation.NonNull; - public class GesturesSettingPreferenceController extends BasePreferenceController { private final AssistGestureFeatureProvider mFeatureProvider; private List mGestureControllers; diff --git a/src/com/android/settings/gestures/PickupGesturePreferenceController.java b/src/com/android/settings/gestures/PickupGesturePreferenceController.java index 399c047c451..7619b69621a 100644 --- a/src/com/android/settings/gestures/PickupGesturePreferenceController.java +++ b/src/com/android/settings/gestures/PickupGesturePreferenceController.java @@ -27,8 +27,6 @@ import android.text.TextUtils; import com.android.internal.hardware.AmbientDisplayConfiguration; -import androidx.annotation.VisibleForTesting; - public class PickupGesturePreferenceController extends GesturePreferenceController { private static final int ON = 1; diff --git a/src/com/android/settings/gestures/PreventRingingPreferenceController.java b/src/com/android/settings/gestures/PreventRingingPreferenceController.java index 1e7c1481403..570c1c61d75 100644 --- a/src/com/android/settings/gestures/PreventRingingPreferenceController.java +++ b/src/com/android/settings/gestures/PreventRingingPreferenceController.java @@ -24,6 +24,11 @@ import android.content.Context; import android.os.Bundle; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.widget.VideoPreference; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnCreate; @@ -31,11 +36,6 @@ import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState; -import androidx.annotation.VisibleForTesting; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class PreventRingingPreferenceController extends PreventRingingParentPreferenceController implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause, OnCreate, OnSaveInstanceState { diff --git a/src/com/android/settings/gestures/ReachGesturePreferenceController.java b/src/com/android/settings/gestures/ReachGesturePreferenceController.java index e22dae42e18..6bfe4f3f913 100644 --- a/src/com/android/settings/gestures/ReachGesturePreferenceController.java +++ b/src/com/android/settings/gestures/ReachGesturePreferenceController.java @@ -20,7 +20,6 @@ import static android.provider.Settings.Secure.DOZE_REACH_GESTURE; import android.annotation.UserIdInt; import android.content.Context; -import android.content.SharedPreferences; import android.os.UserHandle; import android.provider.Settings; import android.text.TextUtils; diff --git a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java index 87333a0ac70..80f668069f1 100644 --- a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java +++ b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java @@ -21,6 +21,9 @@ import android.hardware.input.InputManager; import android.provider.Settings; import android.view.InputDevice; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.TogglePreferenceController; @@ -28,9 +31,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class GameControllerPreferenceController extends TogglePreferenceController implements PreferenceControllerMixin, InputManager.InputDeviceListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceController.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceController.java index 4c08e017f5e..49e07b0be2d 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceController.java +++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceController.java @@ -18,15 +18,15 @@ package com.android.settings.inputmethod; import android.content.Context; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; import com.android.settingslib.inputmethod.InputMethodAndSubtypeEnablerManagerCompat; -import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.PreferenceScreen; - public class InputMethodAndSubtypePreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart, OnStop { diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java index 388e16c3817..f5153890095 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java @@ -35,6 +35,11 @@ import android.widget.CheckedTextView; import android.widget.RadioButton; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; +import androidx.loader.app.LoaderManager.LoaderCallbacks; +import androidx.loader.content.AsyncTaskLoader; +import androidx.loader.content.Loader; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -42,11 +47,6 @@ import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import java.util.ArrayList; import java.util.Collections; -import androidx.appcompat.app.AlertDialog; -import androidx.loader.app.LoaderManager.LoaderCallbacks; -import androidx.loader.content.AsyncTaskLoader; -import androidx.loader.content.Loader; - public class KeyboardLayoutDialogFragment extends InstrumentedDialogFragment implements InputDeviceListener, LoaderCallbacks { private static final String KEY_INPUT_DEVICE_IDENTIFIER = "inputDeviceIdentifier"; diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPickerController.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerController.java index 63fe1474963..4ac52bc1af7 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerController.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerController.java @@ -23,6 +23,11 @@ import android.hardware.input.InputManager; import android.hardware.input.KeyboardLayout; import android.view.InputDevice; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; @@ -32,11 +37,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - public class KeyboardLayoutPickerController extends BasePreferenceController implements InputManager.InputDeviceListener, LifecycleObserver, OnStart, OnStop { diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java index cc1978f4ba0..8d451788387 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java @@ -33,6 +33,12 @@ import android.provider.Settings.Secure; import android.text.TextUtils; import android.view.InputDevice; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.Preconditions; import com.android.settings.R; @@ -49,12 +55,6 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @SearchIndexable public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment implements InputManager.InputDeviceListener, diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java index c0f5782ff22..367ea80e07d 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java @@ -20,6 +20,8 @@ import android.content.Context; import android.hardware.input.InputManager; import android.icu.text.ListFormatter; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.inputmethod.PhysicalKeyboardFragment.HardKeyboardDeviceInfo; @@ -32,8 +34,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; - public class PhysicalKeyboardPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause, diff --git a/src/com/android/settings/inputmethod/SpellCheckerPreference.java b/src/com/android/settings/inputmethod/SpellCheckerPreference.java index 8cd73f714e0..116f1c7b186 100644 --- a/src/com/android/settings/inputmethod/SpellCheckerPreference.java +++ b/src/com/android/settings/inputmethod/SpellCheckerPreference.java @@ -25,12 +25,12 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.textservice.SpellCheckerInfo; -import com.android.settings.CustomListPreference; -import com.android.settings.R; - import androidx.appcompat.app.AlertDialog.Builder; import androidx.preference.PreferenceViewHolder; +import com.android.settings.CustomListPreference; +import com.android.settings.R; + /** * Spell checker service preference. * diff --git a/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java b/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java index cdc1c3a62cb..f0bb8d98288 100644 --- a/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java +++ b/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java @@ -20,14 +20,14 @@ import android.content.Context; import android.view.textservice.SpellCheckerInfo; import android.view.textservice.TextServicesManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtilCompat; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class SpellCheckerPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java index c8eb1099295..28704843506 100644 --- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java +++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java @@ -27,6 +27,12 @@ import android.view.textservice.SpellCheckerSubtype; import android.view.textservice.TextServicesManager; import android.widget.Switch; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -34,12 +40,6 @@ import com.android.settings.SettingsPreferenceFragment; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.SwitchBar.OnSwitchChangeListener; -import androidx.appcompat.app.AlertDialog; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceScreen; - public class SpellCheckersSettings extends SettingsPreferenceFragment implements OnSwitchChangeListener, OnPreferenceClickListener, OnPreferenceChangeListener { private static final String TAG = SpellCheckersSettings.class.getSimpleName(); diff --git a/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java b/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java index 5f134027355..e0c016f1219 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java +++ b/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java @@ -22,13 +22,13 @@ import android.database.MatrixCursor; import android.provider.UserDictionary; import android.util.ArraySet; +import androidx.annotation.VisibleForTesting; +import androidx.loader.content.CursorLoader; + import java.util.Locale; import java.util.Objects; import java.util.Set; -import androidx.annotation.VisibleForTesting; -import androidx.loader.content.CursorLoader; - public class UserDictionaryCursorLoader extends CursorLoader { @VisibleForTesting diff --git a/src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java b/src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java index d2336606e16..4be70d566ae 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java +++ b/src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java @@ -25,6 +25,11 @@ import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodSubtype; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.BasePreferenceController; @@ -35,11 +40,6 @@ import java.util.List; import java.util.Locale; import java.util.TreeSet; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class UserDictionaryListPreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart { diff --git a/src/com/android/settings/inputmethod/UserDictionarySettings.java b/src/com/android/settings/inputmethod/UserDictionarySettings.java index 1e912f1ddf5..cdc8b072715 100644 --- a/src/com/android/settings/inputmethod/UserDictionarySettings.java +++ b/src/com/android/settings/inputmethod/UserDictionarySettings.java @@ -38,6 +38,10 @@ import android.widget.SectionIndexer; import android.widget.SimpleCursorAdapter; import android.widget.TextView; +import androidx.fragment.app.ListFragment; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; @@ -45,10 +49,6 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.instrumentation.Instrumentable; import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin; -import androidx.fragment.app.ListFragment; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.Loader; - public class UserDictionarySettings extends ListFragment implements Instrumentable, LoaderManager.LoaderCallbacks { diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java index 5c6844931fd..61e6a424641 100644 --- a/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java +++ b/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java @@ -24,6 +24,8 @@ import android.text.BidiFormatter; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -31,8 +33,6 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; - public class VirtualKeyboardPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/language/PhoneLanguagePreferenceController.java b/src/com/android/settings/language/PhoneLanguagePreferenceController.java index 8045fc0f8ca..c88bdb615ff 100644 --- a/src/com/android/settings/language/PhoneLanguagePreferenceController.java +++ b/src/com/android/settings/language/PhoneLanguagePreferenceController.java @@ -18,6 +18,8 @@ package com.android.settings.language; import android.content.Context; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; @@ -28,8 +30,6 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.List; -import androidx.preference.Preference; - public class PhoneLanguagePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/language/PointerSpeedController.java b/src/com/android/settings/language/PointerSpeedController.java index 3da3c49b68d..67326ddab0e 100644 --- a/src/com/android/settings/language/PointerSpeedController.java +++ b/src/com/android/settings/language/PointerSpeedController.java @@ -18,11 +18,11 @@ package com.android.settings.language; import android.content.Context; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import androidx.annotation.VisibleForTesting; - public class PointerSpeedController extends BasePreferenceController { diff --git a/src/com/android/settings/language/UserDictionaryPreferenceController.java b/src/com/android/settings/language/UserDictionaryPreferenceController.java index cc54b04a79d..d7829c612b2 100644 --- a/src/com/android/settings/language/UserDictionaryPreferenceController.java +++ b/src/com/android/settings/language/UserDictionaryPreferenceController.java @@ -19,6 +19,9 @@ package com.android.settings.language; import android.content.Context; import android.os.Bundle; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; + import com.android.settings.core.BasePreferenceController; import com.android.settings.inputmethod.UserDictionaryList; import com.android.settings.inputmethod.UserDictionaryListPreferenceController; @@ -26,9 +29,6 @@ import com.android.settings.inputmethod.UserDictionarySettings; import java.util.TreeSet; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; - public class UserDictionaryPreferenceController extends BasePreferenceController { public UserDictionaryPreferenceController(Context context, String key) { diff --git a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java index b59fe7832a1..a06c77eac11 100644 --- a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java +++ b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java @@ -29,6 +29,10 @@ import android.view.ViewGroup; import android.widget.CheckBox; import android.widget.CompoundButton; +import androidx.core.view.MotionEventCompat; +import androidx.recyclerview.widget.ItemTouchHelper; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.app.LocalePicker; import com.android.internal.app.LocaleStore; import com.android.settings.R; @@ -39,10 +43,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import androidx.core.view.MotionEventCompat; -import androidx.recyclerview.widget.ItemTouchHelper; -import androidx.recyclerview.widget.RecyclerView; - class LocaleDragAndDropAdapter extends RecyclerView.Adapter { diff --git a/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java b/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java index d059ad9774a..90698129ccc 100644 --- a/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java +++ b/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java @@ -20,12 +20,12 @@ import android.content.Context; import android.os.Bundle; import android.view.View; -import com.android.settings.R; - import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import com.android.settings.R; + /** * Add accessibility actions to the drag-and-drop locale list * diff --git a/src/com/android/settings/localepicker/LocaleListEditor.java b/src/com/android/settings/localepicker/LocaleListEditor.java index dada1c88dc8..cb66764214b 100644 --- a/src/com/android/settings/localepicker/LocaleListEditor.java +++ b/src/com/android/settings/localepicker/LocaleListEditor.java @@ -31,6 +31,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.app.LocalePicker; import com.android.internal.app.LocaleStore; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -41,9 +44,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import androidx.appcompat.app.AlertDialog; -import androidx.recyclerview.widget.RecyclerView; - /** * Drag-and-drop editor for the user-ordered locale lists. */ diff --git a/src/com/android/settings/location/AppSettingsInjector.java b/src/com/android/settings/location/AppSettingsInjector.java index 6b79a7e0962..b8111f29c4e 100644 --- a/src/com/android/settings/location/AppSettingsInjector.java +++ b/src/com/android/settings/location/AppSettingsInjector.java @@ -26,8 +26,6 @@ import com.android.settings.widget.RestrictedAppPreference; import com.android.settingslib.location.InjectedSetting; import com.android.settingslib.location.SettingsInjector; -import java.util.List; - /** * Adds the preferences specified by the {@link InjectedSetting} objects to a preference group. */ diff --git a/src/com/android/settings/location/BluetoothScanningPreferenceController.java b/src/com/android/settings/location/BluetoothScanningPreferenceController.java index a810dbf4bcc..d16e1e58e2f 100644 --- a/src/com/android/settings/location/BluetoothScanningPreferenceController.java +++ b/src/com/android/settings/location/BluetoothScanningPreferenceController.java @@ -16,12 +16,12 @@ package com.android.settings.location; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.core.AbstractPreferenceController; + public class BluetoothScanningPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/location/LocationEnabler.java b/src/com/android/settings/location/LocationEnabler.java index 78dd206ca3e..65de6e2339d 100644 --- a/src/com/android/settings/location/LocationEnabler.java +++ b/src/com/android/settings/location/LocationEnabler.java @@ -28,6 +28,8 @@ import android.os.UserManager; import android.provider.Settings; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.Utils; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -35,8 +37,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.annotation.VisibleForTesting; - /** * A class that listens to location settings change and modifies location settings diff --git a/src/com/android/settings/location/LocationFooterPreferenceController.java b/src/com/android/settings/location/LocationFooterPreferenceController.java index 6a2c89a7846..3431aa25c05 100644 --- a/src/com/android/settings/location/LocationFooterPreferenceController.java +++ b/src/com/android/settings/location/LocationFooterPreferenceController.java @@ -24,6 +24,10 @@ import android.content.pm.ResolveInfo; import android.location.LocationManager; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; + import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; @@ -34,10 +38,6 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; - /** * Preference controller for location footer preference category */ diff --git a/src/com/android/settings/location/LocationForWorkPreferenceController.java b/src/com/android/settings/location/LocationForWorkPreferenceController.java index 84607a8ebb6..580f8880f93 100644 --- a/src/com/android/settings/location/LocationForWorkPreferenceController.java +++ b/src/com/android/settings/location/LocationForWorkPreferenceController.java @@ -18,15 +18,15 @@ package com.android.settings.location; import android.content.Context; import android.os.UserManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.core.lifecycle.Lifecycle; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class LocationForWorkPreferenceController extends LocationBasePreferenceController { /** diff --git a/src/com/android/settings/location/LocationPreferenceController.java b/src/com/android/settings/location/LocationPreferenceController.java index d48a62715ab..0efc2b1e04e 100644 --- a/src/com/android/settings/location/LocationPreferenceController.java +++ b/src/com/android/settings/location/LocationPreferenceController.java @@ -22,6 +22,10 @@ import android.content.IntentFilter; import android.location.LocationManager; import android.provider.Settings.Secure; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -30,10 +34,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class LocationPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/location/LocationScanningPreferenceController.java b/src/com/android/settings/location/LocationScanningPreferenceController.java index 563a6534d31..9d1bdc0dc86 100644 --- a/src/com/android/settings/location/LocationScanningPreferenceController.java +++ b/src/com/android/settings/location/LocationScanningPreferenceController.java @@ -18,11 +18,11 @@ package com.android.settings.location; import android.content.Context; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import androidx.annotation.VisibleForTesting; - public class LocationScanningPreferenceController extends BasePreferenceController { diff --git a/src/com/android/settings/location/LocationServicePreferenceController.java b/src/com/android/settings/location/LocationServicePreferenceController.java index 035faad16c9..43d35f12aa7 100644 --- a/src/com/android/settings/location/LocationServicePreferenceController.java +++ b/src/com/android/settings/location/LocationServicePreferenceController.java @@ -21,6 +21,11 @@ import android.location.SettingInjectorService; import android.os.UserHandle; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.settings.Utils; import com.android.settings.widget.RestrictedAppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -30,11 +35,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - public class LocationServicePreferenceController extends LocationBasePreferenceController implements LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/location/LocationSliceBuilder.java b/src/com/android/settings/location/LocationSliceBuilder.java index 4883ee8bbe8..56cf676a0a6 100644 --- a/src/com/android/settings/location/LocationSliceBuilder.java +++ b/src/com/android/settings/location/LocationSliceBuilder.java @@ -18,6 +18,7 @@ package com.android.settings.location; import static android.provider.SettingsSlicesContract.KEY_LOCATION; + import static androidx.slice.builders.ListBuilder.ICON_IMAGE; import android.annotation.ColorInt; @@ -28,18 +29,18 @@ import android.content.Intent; import android.net.Uri; import android.provider.SettingsSlicesContract; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.R; -import com.android.settings.SubSettings; -import com.android.settings.Utils; -import com.android.settings.slices.SliceBuilderUtils; - import androidx.core.graphics.drawable.IconCompat; import androidx.slice.Slice; import androidx.slice.builders.ListBuilder; import androidx.slice.builders.ListBuilder.RowBuilder; import androidx.slice.builders.SliceAction; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settings.R; +import com.android.settings.SubSettings; +import com.android.settings.Utils; +import com.android.settings.slices.SliceBuilderUtils; + /** * Utility class to build an intent-based Location Slice. */ diff --git a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java index 77f1b10b947..7660312f0eb 100644 --- a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java +++ b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java @@ -17,6 +17,11 @@ import android.content.Context; import android.os.Bundle; import android.os.UserHandle; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; import com.android.settings.core.SubSettingLauncher; @@ -27,11 +32,6 @@ import com.android.settingslib.location.RecentLocationApps; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - public class RecentLocationRequestPreferenceController extends LocationBasePreferenceController { /** Key for preference category "Recent location requests" */ diff --git a/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java b/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java index 644025e741d..6a1ebd938f1 100644 --- a/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java +++ b/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java @@ -18,17 +18,17 @@ package com.android.settings.location; import android.content.Context; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.settings.widget.AppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - /** Preference controller for preference category displaying all recent location requests. */ public class RecentLocationRequestSeeAllPreferenceController extends LocationBasePreferenceController { diff --git a/src/com/android/settings/location/WifiScanningPreferenceController.java b/src/com/android/settings/location/WifiScanningPreferenceController.java index 255ed31aabb..234ec5e53e1 100644 --- a/src/com/android/settings/location/WifiScanningPreferenceController.java +++ b/src/com/android/settings/location/WifiScanningPreferenceController.java @@ -16,12 +16,12 @@ package com.android.settings.location; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.core.AbstractPreferenceController; + public class WifiScanningPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelper.java b/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelper.java index 960a082adf6..1ae88335b66 100644 --- a/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelper.java +++ b/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelper.java @@ -30,6 +30,13 @@ import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.builders.ListBuilder; +import androidx.slice.builders.ListBuilder.RowBuilder; +import androidx.slice.builders.SliceAction; + import com.android.ims.ImsManager; import com.android.settings.R; import com.android.settings.Utils; @@ -45,13 +52,6 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import androidx.annotation.VisibleForTesting; -import androidx.core.graphics.drawable.IconCompat; -import androidx.slice.Slice; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.ListBuilder.RowBuilder; -import androidx.slice.builders.SliceAction; - /** * Helper class to control slices for enhanced 4g LTE settings. */ diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java index 094cefa770a..80cca2c6412 100644 --- a/src/com/android/settings/network/AirplaneModePreferenceController.java +++ b/src/com/android/settings/network/AirplaneModePreferenceController.java @@ -23,6 +23,11 @@ import android.content.pm.PackageManager; import android.os.SystemProperties; import android.text.TextUtils; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.TelephonyProperties; import com.android.settings.AirplaneModeEnabler; @@ -34,11 +39,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - public class AirplaneModePreferenceController extends TogglePreferenceController implements LifecycleObserver, OnResume, OnPause, AirplaneModeEnabler.OnAirplaneModeChangedListener { diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java index 91a094f8179..47a75c33f55 100644 --- a/src/com/android/settings/network/ApnEditor.java +++ b/src/com/android/settings/network/ApnEditor.java @@ -40,6 +40,15 @@ import android.view.MenuItem; import android.view.View; import android.view.View.OnKeyListener; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.EditTextPreference; +import androidx.preference.ListPreference; +import androidx.preference.MultiSelectListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; import com.android.internal.util.ArrayUtils; @@ -53,15 +62,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; -import androidx.preference.EditTextPreference; -import androidx.preference.ListPreference; -import androidx.preference.MultiSelectListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.SwitchPreference; - public class ApnEditor extends SettingsPreferenceFragment implements OnPreferenceChangeListener, OnKeyListener { diff --git a/src/com/android/settings/network/ApnPreference.java b/src/com/android/settings/network/ApnPreference.java index 603200f51ab..412259bab72 100755 --- a/src/com/android/settings/network/ApnPreference.java +++ b/src/com/android/settings/network/ApnPreference.java @@ -30,11 +30,11 @@ import android.widget.CompoundButton; import android.widget.RadioButton; import android.widget.RelativeLayout; -import com.android.settings.R; - import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; + public class ApnPreference extends Preference implements CompoundButton.OnCheckedChangeListener, OnClickListener { final static String TAG = "ApnPreference"; diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java index 25734d64173..df0b1b4dfea 100755 --- a/src/com/android/settings/network/ApnSettings.java +++ b/src/com/android/settings/network/ApnSettings.java @@ -50,6 +50,9 @@ import android.view.MenuItem; import android.view.MotionEvent; import android.widget.Toast; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.TelephonyIntents; @@ -62,9 +65,6 @@ import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import java.util.ArrayList; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; - public class ApnSettings extends RestrictedSettingsFragment implements Preference.OnPreferenceChangeListener { static final String TAG = "ApnSettings"; diff --git a/src/com/android/settings/network/MobileNetworkPreferenceController.java b/src/com/android/settings/network/MobileNetworkPreferenceController.java index 06d3f87016c..ece42948c7b 100644 --- a/src/com/android/settings/network/MobileNetworkPreferenceController.java +++ b/src/com/android/settings/network/MobileNetworkPreferenceController.java @@ -30,6 +30,10 @@ import android.telephony.ServiceState; import android.telephony.TelephonyManager; import android.util.FeatureFlagUtils; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.FeatureFlags; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedLockUtils; @@ -40,10 +44,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class MobileNetworkPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop { diff --git a/src/com/android/settings/network/MobilePlanPreferenceController.java b/src/com/android/settings/network/MobilePlanPreferenceController.java index 1e74bb175d9..1db6b2e0b32 100644 --- a/src/com/android/settings/network/MobilePlanPreferenceController.java +++ b/src/com/android/settings/network/MobilePlanPreferenceController.java @@ -19,6 +19,7 @@ import static android.content.Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static android.os.UserHandle.myUserId; import static android.os.UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS; + import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction; import android.content.ActivityNotFoundException; @@ -34,6 +35,8 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.Utils; @@ -44,8 +47,6 @@ import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState; import java.util.List; -import androidx.preference.Preference; - public class MobilePlanPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnCreate, OnSaveInstanceState { diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java index fbb0b20a543..a2a24506834 100644 --- a/src/com/android/settings/network/NetworkDashboardFragment.java +++ b/src/com/android/settings/network/NetworkDashboardFragment.java @@ -27,6 +27,10 @@ import android.text.BidiFormatter; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; @@ -43,10 +47,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; - @SearchIndexable public class NetworkDashboardFragment extends DashboardFragment implements MobilePlanPreferenceHost { diff --git a/src/com/android/settings/network/NetworkResetRestrictionChecker.java b/src/com/android/settings/network/NetworkResetRestrictionChecker.java index 90ade2190f1..bb1fde7bf59 100644 --- a/src/com/android/settings/network/NetworkResetRestrictionChecker.java +++ b/src/com/android/settings/network/NetworkResetRestrictionChecker.java @@ -20,10 +20,10 @@ import android.content.Context; import android.os.UserHandle; import android.os.UserManager; -import com.android.settingslib.RestrictedLockUtils; - import androidx.annotation.VisibleForTesting; +import com.android.settingslib.RestrictedLockUtils; + public class NetworkResetRestrictionChecker { private final Context mContext; diff --git a/src/com/android/settings/network/NetworkScorerPicker.java b/src/com/android/settings/network/NetworkScorerPicker.java index c9d74598e5d..d9c20ffdf48 100644 --- a/src/com/android/settings/network/NetworkScorerPicker.java +++ b/src/com/android/settings/network/NetworkScorerPicker.java @@ -24,6 +24,10 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.InstrumentedPreferenceFragment; @@ -31,10 +35,6 @@ import com.android.settings.widget.RadioButtonPreference; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * Fragment for choosing default network scorer. */ diff --git a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java index 8a99b63bac5..7239b00d084 100644 --- a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java +++ b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java @@ -19,14 +19,14 @@ import android.content.Context; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.AbstractPreferenceController; import java.util.List; -import androidx.preference.Preference; - /** * {@link AbstractPreferenceController} that shows the active network scorer and toggles the * preference based on whether or not there are valid scorers installed. diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java index ad90e728e44..9e083453a9a 100644 --- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java +++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java @@ -40,6 +40,9 @@ import android.widget.EditText; import android.widget.RadioGroup; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; @@ -50,9 +53,6 @@ import com.android.settingslib.HelpUtils; import java.util.HashMap; import java.util.Map; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; - /** * Dialog to set the Private DNS */ diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java index 1c62f811072..561801052a6 100644 --- a/src/com/android/settings/network/PrivateDnsPreferenceController.java +++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java @@ -36,6 +36,9 @@ import android.os.Handler; import android.os.Looper; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.util.ArrayUtils; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; @@ -47,9 +50,6 @@ import com.android.settingslib.core.lifecycle.events.OnStop; import java.net.InetAddress; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class PrivateDnsPreferenceController extends BasePreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop { private static final String KEY_PRIVATE_DNS_SETTINGS = "private_dns_settings"; diff --git a/src/com/android/settings/network/ProxyPreferenceController.java b/src/com/android/settings/network/ProxyPreferenceController.java index a1e29c9af87..8f26bfb6b10 100644 --- a/src/com/android/settings/network/ProxyPreferenceController.java +++ b/src/com/android/settings/network/ProxyPreferenceController.java @@ -18,12 +18,12 @@ package com.android.settings.network; import android.app.admin.DevicePolicyManager; import android.content.Context; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.core.AbstractPreferenceController; + public class ProxyPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java index 0b49186e2fe..f9a03d951f6 100644 --- a/src/com/android/settings/network/TetherPreferenceController.java +++ b/src/com/android/settings/network/TetherPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.network; import static android.os.UserManager.DISALLOW_CONFIG_TETHERING; + import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced; import android.bluetooth.BluetoothAdapter; @@ -33,6 +34,10 @@ import android.os.Handler; import android.os.UserHandle; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.TetherSettings; import com.android.settings.core.PreferenceControllerMixin; @@ -47,10 +52,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.concurrent.atomic.AtomicReference; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class TetherPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnCreate, OnResume, OnPause, OnDestroy { diff --git a/src/com/android/settings/network/VpnPreferenceController.java b/src/com/android/settings/network/VpnPreferenceController.java index cb68d27b13e..8ecd79660f9 100644 --- a/src/com/android/settings/network/VpnPreferenceController.java +++ b/src/com/android/settings/network/VpnPreferenceController.java @@ -32,6 +32,10 @@ import android.provider.SettingsSlicesContract; import android.util.Log; import android.util.SparseArray; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.net.LegacyVpnInfo; import com.android.internal.net.VpnConfig; import com.android.settings.R; @@ -45,10 +49,6 @@ import com.android.settingslib.utils.ThreadUtils; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class VpnPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java index f6b9412704e..181faa50213 100644 --- a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java +++ b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java @@ -18,14 +18,14 @@ package com.android.settings.nfc; import android.content.Context; import android.nfc.NfcAdapter; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.preference.PreferenceScreen; - public class AndroidBeamPreferenceController extends BasePreferenceController implements LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/nfc/NfcForegroundPreferenceController.java b/src/com/android/settings/nfc/NfcForegroundPreferenceController.java index cee24c2b22a..7f8d0849770 100644 --- a/src/com/android/settings/nfc/NfcForegroundPreferenceController.java +++ b/src/com/android/settings/nfc/NfcForegroundPreferenceController.java @@ -17,6 +17,10 @@ import android.content.Context; import android.content.pm.PackageManager; import android.text.TextUtils; +import androidx.preference.DropDownPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; @@ -25,10 +29,6 @@ import com.android.settingslib.core.lifecycle.events.OnStop; import java.util.List; -import androidx.preference.DropDownPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class NfcForegroundPreferenceController extends BasePreferenceController implements PaymentBackend.Callback, Preference.OnPreferenceChangeListener, LifecycleObserver, OnStart, OnStop { diff --git a/src/com/android/settings/nfc/NfcPaymentPreference.java b/src/com/android/settings/nfc/NfcPaymentPreference.java index f5275ecc6e2..421148bcc3a 100644 --- a/src/com/android/settings/nfc/NfcPaymentPreference.java +++ b/src/com/android/settings/nfc/NfcPaymentPreference.java @@ -19,11 +19,11 @@ import android.content.Context; import android.content.DialogInterface; import android.util.AttributeSet; -import com.android.settingslib.CustomDialogPreferenceCompat; - import androidx.appcompat.app.AlertDialog.Builder; import androidx.preference.PreferenceViewHolder; +import com.android.settingslib.CustomDialogPreferenceCompat; + public class NfcPaymentPreference extends CustomDialogPreferenceCompat { private Listener mListener; diff --git a/src/com/android/settings/nfc/NfcPaymentPreferenceController.java b/src/com/android/settings/nfc/NfcPaymentPreferenceController.java index 8996cb19dd2..a7dd2a653dd 100644 --- a/src/com/android/settings/nfc/NfcPaymentPreferenceController.java +++ b/src/com/android/settings/nfc/NfcPaymentPreferenceController.java @@ -29,6 +29,11 @@ import android.widget.CompoundButton; import android.widget.ImageView; import android.widget.RadioButton; +import androidx.appcompat.app.AlertDialog.Builder; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.nfc.PaymentBackend.PaymentAppInfo; @@ -38,11 +43,6 @@ import com.android.settingslib.core.lifecycle.events.OnStop; import java.util.List; -import androidx.appcompat.app.AlertDialog.Builder; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.PreferenceViewHolder; - public class NfcPaymentPreferenceController extends BasePreferenceController implements PaymentBackend.Callback, View.OnClickListener, NfcPaymentPreference.Listener, LifecycleObserver, OnStart, OnStop { diff --git a/src/com/android/settings/nfc/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java index d0ba58b682f..04f288d721b 100644 --- a/src/com/android/settings/nfc/NfcPreferenceController.java +++ b/src/com/android/settings/nfc/NfcPreferenceController.java @@ -20,15 +20,15 @@ import android.content.IntentFilter; import android.nfc.NfcAdapter; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.core.TogglePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - public class NfcPreferenceController extends TogglePreferenceController implements LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java index 530a2268073..5b4c2458f2d 100644 --- a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java +++ b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java @@ -27,6 +27,9 @@ import android.provider.Settings; import android.service.notification.ConditionProviderService; import android.service.notification.ZenModeConfig; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -37,9 +40,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; - abstract public class AbstractZenModeAutomaticRulePreferenceController extends AbstractZenModePreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/AbstractZenModePreferenceController.java b/src/com/android/settings/notification/AbstractZenModePreferenceController.java index 791e28c3cf1..383934a236c 100644 --- a/src/com/android/settings/notification/AbstractZenModePreferenceController.java +++ b/src/com/android/settings/notification/AbstractZenModePreferenceController.java @@ -30,6 +30,10 @@ import android.provider.Settings; import android.service.notification.ScheduleCalendar; import android.service.notification.ZenModeConfig; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.AbstractPreferenceController; @@ -39,10 +43,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - abstract public class AbstractZenModePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java b/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java index 6af4d06ffb8..df2cd450605 100644 --- a/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java +++ b/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java @@ -22,14 +22,14 @@ import android.media.AudioManager; import android.os.UserHandle; import android.os.UserManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.accounts.AccountRestrictionHelper; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.SliderPreferenceController; import com.android.settingslib.RestrictedPreference; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - /** * Base class for preference controller that handles preference that enforce adjust volume * restriction diff --git a/src/com/android/settings/notification/AllowSoundPreferenceController.java b/src/com/android/settings/notification/AllowSoundPreferenceController.java index 0943a8a2f20..cbabd2d6e1d 100644 --- a/src/com/android/settings/notification/AllowSoundPreferenceController.java +++ b/src/com/android/settings/notification/AllowSoundPreferenceController.java @@ -24,11 +24,11 @@ import android.app.NotificationChannel; import android.content.Context; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedSwitchPreference; -import androidx.preference.Preference; - public class AllowSoundPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/AppLinkPreferenceController.java b/src/com/android/settings/notification/AppLinkPreferenceController.java index b510602ad0c..c696e8ef8a4 100644 --- a/src/com/android/settings/notification/AppLinkPreferenceController.java +++ b/src/com/android/settings/notification/AppLinkPreferenceController.java @@ -18,10 +18,10 @@ package com.android.settings.notification; import android.content.Context; -import com.android.settings.core.PreferenceControllerMixin; - import androidx.preference.Preference; +import com.android.settings.core.PreferenceControllerMixin; + /** * Controls link to reach more preference settings inside the app. */ diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java index cbb50433fd1..c628da97844 100644 --- a/src/com/android/settings/notification/AppNotificationSettings.java +++ b/src/com/android/settings/notification/AppNotificationSettings.java @@ -24,6 +24,12 @@ import android.os.Bundle; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; @@ -36,12 +42,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - /** These settings are per app, so should not be returned in global search results. */ public class AppNotificationSettings extends NotificationSettingsBase { private static final String TAG = "AppNotificationSettings"; diff --git a/src/com/android/settings/notification/BadgePreferenceController.java b/src/com/android/settings/notification/BadgePreferenceController.java index 35a8f3fe074..ad417b0ad6a 100644 --- a/src/com/android/settings/notification/BadgePreferenceController.java +++ b/src/com/android/settings/notification/BadgePreferenceController.java @@ -21,11 +21,11 @@ import static android.provider.Settings.Secure.NOTIFICATION_BADGING; import android.content.Context; import android.provider.Settings; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedSwitchPreference; -import androidx.preference.Preference; - public class BadgePreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java index fd24976385a..613204b9375 100644 --- a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java +++ b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java @@ -26,16 +26,16 @@ import android.os.Handler; import android.provider.Settings; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.TogglePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class BadgingNotificationPreferenceController extends TogglePreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/notification/BlockPreferenceController.java b/src/com/android/settings/notification/BlockPreferenceController.java index 096ec083f74..9e4c4632004 100644 --- a/src/com/android/settings/notification/BlockPreferenceController.java +++ b/src/com/android/settings/notification/BlockPreferenceController.java @@ -24,13 +24,13 @@ import android.app.NotificationManager; import android.content.Context; import android.widget.Switch; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.widget.SwitchBar; -import androidx.preference.Preference; - public class BlockPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, SwitchBar.OnSwitchChangeListener { diff --git a/src/com/android/settings/notification/BootSoundPreferenceController.java b/src/com/android/settings/notification/BootSoundPreferenceController.java index b3db7dd606b..a6871639a7f 100644 --- a/src/com/android/settings/notification/BootSoundPreferenceController.java +++ b/src/com/android/settings/notification/BootSoundPreferenceController.java @@ -19,14 +19,14 @@ package com.android.settings.notification; import android.content.Context; import android.os.SystemProperties; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.core.AbstractPreferenceController; + public class BootSoundPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/ChannelGroupNotificationSettings.java b/src/com/android/settings/notification/ChannelGroupNotificationSettings.java index 897a49764b6..17710c4c58e 100644 --- a/src/com/android/settings/notification/ChannelGroupNotificationSettings.java +++ b/src/com/android/settings/notification/ChannelGroupNotificationSettings.java @@ -20,6 +20,8 @@ import android.app.NotificationChannel; import android.content.Context; import android.util.Log; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; @@ -28,8 +30,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import androidx.preference.Preference; - public class ChannelGroupNotificationSettings extends NotificationSettingsBase { private static final String TAG = "ChannelGroupSettings"; diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java index 56508d9abb8..3580967b461 100644 --- a/src/com/android/settings/notification/ChannelNotificationSettings.java +++ b/src/com/android/settings/notification/ChannelNotificationSettings.java @@ -23,6 +23,8 @@ import android.preference.PreferenceManager; import android.text.TextUtils; import android.util.Log; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; @@ -31,8 +33,6 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.ArrayList; import java.util.List; -import androidx.preference.PreferenceScreen; - public class ChannelNotificationSettings extends NotificationSettingsBase { private static final String TAG = "ChannelSettings"; diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java index 13c5e888e2a..9da8ca1cec2 100644 --- a/src/com/android/settings/notification/ConfigureNotificationSettings.java +++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java @@ -24,6 +24,10 @@ import android.os.Bundle; import android.os.UserHandle; import android.provider.SearchIndexableResource; +import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.RingtonePreference; @@ -40,10 +44,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; - @SearchIndexable public class ConfigureNotificationSettings extends DashboardFragment implements OnActivityResultListener { diff --git a/src/com/android/settings/notification/DeletedChannelsPreferenceController.java b/src/com/android/settings/notification/DeletedChannelsPreferenceController.java index cbc669174ac..14e0c84e2f8 100644 --- a/src/com/android/settings/notification/DeletedChannelsPreferenceController.java +++ b/src/com/android/settings/notification/DeletedChannelsPreferenceController.java @@ -18,11 +18,11 @@ package com.android.settings.notification; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; -import androidx.preference.Preference; - public class DeletedChannelsPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/DescriptionPreferenceController.java b/src/com/android/settings/notification/DescriptionPreferenceController.java index bb59caedf47..1e996463aa0 100644 --- a/src/com/android/settings/notification/DescriptionPreferenceController.java +++ b/src/com/android/settings/notification/DescriptionPreferenceController.java @@ -19,10 +19,10 @@ package com.android.settings.notification; import android.content.Context; import android.text.TextUtils; -import com.android.settings.core.PreferenceControllerMixin; - import androidx.preference.Preference; +import com.android.settings.core.PreferenceControllerMixin; + public class DescriptionPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/DndPreferenceController.java b/src/com/android/settings/notification/DndPreferenceController.java index 79efef5e921..a615221dff9 100644 --- a/src/com/android/settings/notification/DndPreferenceController.java +++ b/src/com/android/settings/notification/DndPreferenceController.java @@ -19,11 +19,11 @@ package com.android.settings.notification; import android.app.NotificationChannel; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedSwitchPreference; -import androidx.preference.Preference; - public class DndPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java index 052bbeb146d..7add167ab8e 100644 --- a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java +++ b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java @@ -21,14 +21,14 @@ import android.content.pm.PackageManager; import android.os.UserHandle; import android.os.UserManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.accounts.AccountRestrictionHelper; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - /** * Base class for preference controller that handles preference that enforce adjust volume * restriction diff --git a/src/com/android/settings/notification/HeaderPreferenceController.java b/src/com/android/settings/notification/HeaderPreferenceController.java index 6ddafc31ef4..f0c860f3514 100644 --- a/src/com/android/settings/notification/HeaderPreferenceController.java +++ b/src/com/android/settings/notification/HeaderPreferenceController.java @@ -25,17 +25,17 @@ import android.text.SpannableStringBuilder; import android.text.TextUtils; import android.view.View; +import androidx.lifecycle.LifecycleObserver; +import androidx.lifecycle.OnLifecycleEvent; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragmentCompat; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.core.lifecycle.Lifecycle; -import androidx.lifecycle.LifecycleObserver; -import androidx.lifecycle.OnLifecycleEvent; -import androidx.preference.Preference; -import androidx.preference.PreferenceFragmentCompat; - public class HeaderPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, LifecycleObserver { diff --git a/src/com/android/settings/notification/ImportancePreferenceController.java b/src/com/android/settings/notification/ImportancePreferenceController.java index e9606f4eba5..4c20a46409d 100644 --- a/src/com/android/settings/notification/ImportancePreferenceController.java +++ b/src/com/android/settings/notification/ImportancePreferenceController.java @@ -27,12 +27,12 @@ import android.app.NotificationManager; import android.content.Context; import android.media.RingtoneManager; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.RestrictedListPreference; import com.android.settings.core.PreferenceControllerMixin; -import androidx.preference.Preference; - public class ImportancePreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/LightsPreferenceController.java b/src/com/android/settings/notification/LightsPreferenceController.java index fa35bfd2cc2..04f25510c2e 100644 --- a/src/com/android/settings/notification/LightsPreferenceController.java +++ b/src/com/android/settings/notification/LightsPreferenceController.java @@ -20,11 +20,11 @@ import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedSwitchPreference; -import androidx.preference.Preference; - public class LightsPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java index a05e27b0240..d708edfb53b 100644 --- a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java +++ b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java @@ -31,6 +31,9 @@ import android.provider.Settings; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.RestrictedListPreference; @@ -45,9 +48,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.ArrayList; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class LockScreenNotificationPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java index 9bfbd2c5b9f..4d581bb22c2 100644 --- a/src/com/android/settings/notification/NotificationAccessSettings.java +++ b/src/com/android/settings/notification/NotificationAccessSettings.java @@ -26,8 +26,12 @@ import android.os.UserManager; import android.provider.SearchIndexableResource; import android.provider.Settings; import android.service.notification.NotificationListenerService; - import android.widget.Toast; + +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -40,10 +44,6 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; - /** * Settings screen for managing notification listener permissions */ diff --git a/src/com/android/settings/notification/NotificationAppPreference.java b/src/com/android/settings/notification/NotificationAppPreference.java index 9cc934537b6..dfa3e36800b 100644 --- a/src/com/android/settings/notification/NotificationAppPreference.java +++ b/src/com/android/settings/notification/NotificationAppPreference.java @@ -20,12 +20,12 @@ import android.util.AttributeSet; import android.view.View; import android.widget.Switch; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.widget.MasterSwitchPreference; import com.android.settingslib.RestrictedLockUtils; -import androidx.preference.PreferenceViewHolder; - /** * Shows an app icon, title and summary. Has a second switch touch target. */ diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java index 83e427b6e65..01f12283773 100644 --- a/src/com/android/settings/notification/NotificationBackend.java +++ b/src/com/android/settings/notification/NotificationBackend.java @@ -38,6 +38,8 @@ import android.text.format.DateUtils; import android.util.IconDrawableFactory; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settingslib.R; import com.android.settingslib.Utils; import com.android.settingslib.utils.StringUtil; @@ -47,8 +49,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import androidx.annotation.VisibleForTesting; - public class NotificationBackend { private static final String TAG = "NotificationBackend"; diff --git a/src/com/android/settings/notification/NotificationFooterPreference.java b/src/com/android/settings/notification/NotificationFooterPreference.java index d3d29a3621c..abaffc85941 100644 --- a/src/com/android/settings/notification/NotificationFooterPreference.java +++ b/src/com/android/settings/notification/NotificationFooterPreference.java @@ -21,12 +21,12 @@ import android.text.method.LinkMovementMethod; import android.util.AttributeSet; import android.widget.TextView; -import com.android.settingslib.R; - import androidx.core.content.res.TypedArrayUtils; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.settingslib.R; + /** * FooterPreference that can have any key or ordering. */ diff --git a/src/com/android/settings/notification/NotificationLockscreenPreference.java b/src/com/android/settings/notification/NotificationLockscreenPreference.java index 3370f3ec785..8c04e168ad8 100644 --- a/src/com/android/settings/notification/NotificationLockscreenPreference.java +++ b/src/com/android/settings/notification/NotificationLockscreenPreference.java @@ -30,14 +30,14 @@ import android.widget.CompoundButton; import android.widget.ListAdapter; import android.widget.ListView; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AlertDialog.Builder; + import com.android.settings.R; import com.android.settings.RestrictedListPreference; import com.android.settings.Utils; import com.android.settingslib.RestrictedLockUtils; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AlertDialog.Builder; - public class NotificationLockscreenPreference extends RestrictedListPreference { private boolean mAllowRemoteInput; diff --git a/src/com/android/settings/notification/NotificationPreferenceController.java b/src/com/android/settings/notification/NotificationPreferenceController.java index 90dd852def5..c3552cc333a 100644 --- a/src/com/android/settings/notification/NotificationPreferenceController.java +++ b/src/com/android/settings/notification/NotificationPreferenceController.java @@ -27,14 +27,14 @@ import android.content.pm.PackageManager; import android.os.UserManager; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.core.AbstractPreferenceController; import java.util.Objects; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; - /** * Parent class for preferences appearing on notification setting pages at the app, * notification channel group, or notification channel level. diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java index 44f77cfe4f4..a645c4b0243 100644 --- a/src/com/android/settings/notification/NotificationSettingsBase.java +++ b/src/com/android/settings/notification/NotificationSettingsBase.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; + import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import android.app.Notification; @@ -40,6 +41,10 @@ import android.text.TextUtils; import android.util.Log; import android.widget.Toast; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.applications.AppInfoBase; @@ -52,10 +57,6 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - abstract public class NotificationSettingsBase extends DashboardFragment { private static final String TAG = "NotifiSettingsBase"; private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); diff --git a/src/com/android/settings/notification/NotificationStation.java b/src/com/android/settings/notification/NotificationStation.java index 428837304cd..d3ebc08f77a 100644 --- a/src/com/android/settings/notification/NotificationStation.java +++ b/src/com/android/settings/notification/NotificationStation.java @@ -49,6 +49,10 @@ import android.widget.DateTimeView; import android.widget.ImageView; import android.widget.TextView; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -59,10 +63,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; -import androidx.recyclerview.widget.RecyclerView; - public class NotificationStation extends SettingsPreferenceFragment { private static final String TAG = NotificationStation.class.getSimpleName(); diff --git a/src/com/android/settings/notification/NotificationSwitchBarPreference.java b/src/com/android/settings/notification/NotificationSwitchBarPreference.java index d9c339b5c66..ff429879925 100644 --- a/src/com/android/settings/notification/NotificationSwitchBarPreference.java +++ b/src/com/android/settings/notification/NotificationSwitchBarPreference.java @@ -20,12 +20,12 @@ import android.content.Context; import android.util.AttributeSet; import android.view.View; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.applications.LayoutPreference; import com.android.settings.widget.ToggleSwitch; import com.android.settingslib.RestrictedLockUtils; -import androidx.preference.PreferenceViewHolder; - public class NotificationSwitchBarPreference extends LayoutPreference { private ToggleSwitch mSwitch; private boolean mChecked; diff --git a/src/com/android/settings/notification/NotificationsOffPreferenceController.java b/src/com/android/settings/notification/NotificationsOffPreferenceController.java index 99f6063f2c8..8762f91c271 100644 --- a/src/com/android/settings/notification/NotificationsOffPreferenceController.java +++ b/src/com/android/settings/notification/NotificationsOffPreferenceController.java @@ -18,11 +18,11 @@ package com.android.settings.notification; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; -import androidx.preference.Preference; - public class NotificationsOffPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/PulseNotificationPreferenceController.java b/src/com/android/settings/notification/PulseNotificationPreferenceController.java index bcf7b17a5a0..78855208f79 100644 --- a/src/com/android/settings/notification/PulseNotificationPreferenceController.java +++ b/src/com/android/settings/notification/PulseNotificationPreferenceController.java @@ -25,14 +25,14 @@ import android.net.Uri; import android.os.Handler; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.TogglePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class PulseNotificationPreferenceController extends TogglePreferenceController implements LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java index c7a3201fe97..a027aec7e1c 100644 --- a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java +++ b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java @@ -29,6 +29,12 @@ import android.util.ArraySet; import android.util.IconDrawableFactory; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.AppInfoBase; @@ -47,12 +53,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import androidx.annotation.VisibleForTesting; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - /** * This controller displays a list of recently used apps and a "See all" button. If there is * no recently used app, "See all" will be displayed as "Notifications". diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java index b6025432c1f..517c0410b31 100644 --- a/src/com/android/settings/notification/RedactionInterstitial.java +++ b/src/com/android/settings/notification/RedactionInterstitial.java @@ -20,6 +20,7 @@ import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTI import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS; import static android.provider.Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS; import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS; + import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import android.content.Context; diff --git a/src/com/android/settings/notification/RingVolumePreferenceController.java b/src/com/android/settings/notification/RingVolumePreferenceController.java index e2668a3c19d..75ad4a701df 100644 --- a/src/com/android/settings/notification/RingVolumePreferenceController.java +++ b/src/com/android/settings/notification/RingVolumePreferenceController.java @@ -29,14 +29,14 @@ import android.os.Message; import android.os.Vibrator; import android.text.TextUtils; +import androidx.lifecycle.OnLifecycleEvent; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.Objects; -import androidx.lifecycle.OnLifecycleEvent; - public class RingVolumePreferenceController extends VolumeSeekBarPreferenceController { private static final String TAG = "RingVolumeController"; diff --git a/src/com/android/settings/notification/RingtonePreferenceControllerBase.java b/src/com/android/settings/notification/RingtonePreferenceControllerBase.java index e7fffd1bacf..7d5ebf13347 100644 --- a/src/com/android/settings/notification/RingtonePreferenceControllerBase.java +++ b/src/com/android/settings/notification/RingtonePreferenceControllerBase.java @@ -21,11 +21,11 @@ import android.media.Ringtone; import android.media.RingtoneManager; import android.net.Uri; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; - public abstract class RingtonePreferenceControllerBase extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/SettingPref.java b/src/com/android/settings/notification/SettingPref.java index f7152fa19a3..9a374552732 100644 --- a/src/com/android/settings/notification/SettingPref.java +++ b/src/com/android/settings/notification/SettingPref.java @@ -24,13 +24,13 @@ import android.provider.Settings.Global; import android.provider.Settings.Secure; import android.provider.Settings.System; -import com.android.settings.SettingsPreferenceFragment; - import androidx.preference.DropDownPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.TwoStatePreference; +import com.android.settings.SettingsPreferenceFragment; + /** Helper to manage a two-state or dropdown preference bound to a global or system setting. */ public class SettingPref { public static final int TYPE_GLOBAL = 1; diff --git a/src/com/android/settings/notification/SettingPrefController.java b/src/com/android/settings/notification/SettingPrefController.java index 71f02f150db..8d48d53196c 100644 --- a/src/com/android/settings/notification/SettingPrefController.java +++ b/src/com/android/settings/notification/SettingPrefController.java @@ -22,6 +22,10 @@ import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.SettingsPreferenceFragment; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -30,10 +34,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public abstract class SettingPrefController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/notification/SoundPreferenceController.java b/src/com/android/settings/notification/SoundPreferenceController.java index 2a21bcbe01e..d0b098c8d60 100644 --- a/src/com/android/settings/notification/SoundPreferenceController.java +++ b/src/com/android/settings/notification/SoundPreferenceController.java @@ -23,12 +23,12 @@ import android.content.Intent; import android.net.Uri; import android.preference.PreferenceManager; -import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.core.PreferenceControllerMixin; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.SettingsPreferenceFragment; +import com.android.settings.core.PreferenceControllerMixin; + public class SoundPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener, PreferenceManager.OnActivityResultListener { diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java index cc3b7c9f7dc..99fd3d58954 100644 --- a/src/com/android/settings/notification/SoundSettings.java +++ b/src/com/android/settings/notification/SoundSettings.java @@ -27,6 +27,10 @@ import android.preference.SeekBarVolumizer; import android.provider.SearchIndexableResource; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -47,10 +51,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.ListPreference; -import androidx.preference.Preference; - @SearchIndexable public class SoundSettings extends DashboardFragment implements OnActivityResultListener { private static final String TAG = "SoundSettings"; diff --git a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java index 2bd2c27adf3..ae111b20812 100644 --- a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java +++ b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java @@ -26,15 +26,15 @@ import android.os.Handler; import android.provider.Settings; import android.text.TextUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.Utils; import com.android.settings.core.TogglePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class VibrateWhenRingPreferenceController extends TogglePreferenceController implements LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/notification/VibrationPreferenceController.java b/src/com/android/settings/notification/VibrationPreferenceController.java index 75a19a9cb19..ec5554a9d45 100644 --- a/src/com/android/settings/notification/VibrationPreferenceController.java +++ b/src/com/android/settings/notification/VibrationPreferenceController.java @@ -20,11 +20,11 @@ import android.app.NotificationManager; import android.content.Context; import android.os.Vibrator; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedSwitchPreference; -import androidx.preference.Preference; - public class VibrationPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/VisibilityPreferenceController.java b/src/com/android/settings/notification/VisibilityPreferenceController.java index 02bdee663f0..578a6c3fb9f 100644 --- a/src/com/android/settings/notification/VisibilityPreferenceController.java +++ b/src/com/android/settings/notification/VisibilityPreferenceController.java @@ -26,6 +26,8 @@ import android.os.UserHandle; import android.provider.Settings; import android.service.notification.NotificationListenerService; +import androidx.preference.Preference; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.RestrictedListPreference; @@ -34,8 +36,6 @@ import com.android.settingslib.RestrictedLockUtils; import java.util.ArrayList; -import androidx.preference.Preference; - public class VisibilityPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/VolumeSeekBarPreference.java b/src/com/android/settings/notification/VolumeSeekBarPreference.java index 6c84fba392d..2ef33d4ab04 100644 --- a/src/com/android/settings/notification/VolumeSeekBarPreference.java +++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java @@ -28,14 +28,14 @@ import android.widget.ImageView; import android.widget.SeekBar; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.widget.SeekBarPreference; import java.util.Objects; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceViewHolder; - /** A slider preference that directly controls an audio stream volume (no dialog) **/ public class VolumeSeekBarPreference extends SeekBarPreference { private static final String TAG = "VolumeSeekBarPreference"; diff --git a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java index 7df1dcf80e5..32f2aa6b1bc 100644 --- a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java +++ b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java @@ -18,14 +18,14 @@ package com.android.settings.notification; import android.content.Context; -import com.android.settings.notification.VolumeSeekBarPreference.Callback; -import com.android.settingslib.core.lifecycle.Lifecycle; - import androidx.annotation.VisibleForTesting; import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; import androidx.preference.PreferenceScreen; +import com.android.settings.notification.VolumeSeekBarPreference.Callback; +import com.android.settingslib.core.lifecycle.Lifecycle; + /** * Base class for preference controller that handles VolumeSeekBarPreference */ diff --git a/src/com/android/settings/notification/WorkSoundPreferenceController.java b/src/com/android/settings/notification/WorkSoundPreferenceController.java index 26cd8aa13b8..b640d5a247e 100644 --- a/src/com/android/settings/notification/WorkSoundPreferenceController.java +++ b/src/com/android/settings/notification/WorkSoundPreferenceController.java @@ -31,6 +31,15 @@ import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.FragmentManager; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.DefaultRingtonePreference; import com.android.settings.R; @@ -45,15 +54,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.FragmentManager; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; - public class WorkSoundPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java index 2e4bb4e6a43..70c7150c0eb 100644 --- a/src/com/android/settings/notification/ZenAccessSettings.java +++ b/src/com/android/settings/notification/ZenAccessSettings.java @@ -42,6 +42,13 @@ import android.util.ArraySet; import android.util.Log; import android.view.View; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -56,13 +63,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @SearchIndexable public class ZenAccessSettings extends EmptyTextSettings { private final String TAG = "ZenAccessSettings"; diff --git a/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java b/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java index 6468f1d02d1..18415c7df6e 100644 --- a/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java +++ b/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java @@ -27,6 +27,10 @@ import android.service.notification.ZenModeConfig; import android.util.Slog; import android.view.View; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragmentCompat; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; @@ -34,10 +38,6 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.core.lifecycle.Lifecycle; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceFragmentCompat; - public class ZenAutomaticRuleHeaderPreferenceController extends AbstractZenModePreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java b/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java index c980d909a1b..d4114026c16 100644 --- a/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java +++ b/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java @@ -20,15 +20,15 @@ import android.app.AutomaticZenRule; import android.content.Context; import android.widget.Switch; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.widget.SwitchBar; import com.android.settingslib.core.lifecycle.Lifecycle; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class ZenAutomaticRuleSwitchPreferenceController extends AbstractZenModeAutomaticRulePreferenceController implements SwitchBar.OnSwitchChangeListener { diff --git a/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java b/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java index ad662654453..000a7563206 100644 --- a/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java +++ b/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java @@ -21,11 +21,11 @@ import android.util.AttributeSet; import android.view.View; import android.widget.RadioButton; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.TwoTargetPreference; -import androidx.preference.PreferenceViewHolder; - /** * A radio button preference with a divider and a settings icon that links to another screen. */ diff --git a/src/com/android/settings/notification/ZenDeleteRuleDialog.java b/src/com/android/settings/notification/ZenDeleteRuleDialog.java index c460d84237d..ea582d19b88 100644 --- a/src/com/android/settings/notification/ZenDeleteRuleDialog.java +++ b/src/com/android/settings/notification/ZenDeleteRuleDialog.java @@ -21,13 +21,13 @@ import android.content.DialogInterface; import android.os.Bundle; import android.view.View; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; - public class ZenDeleteRuleDialog extends InstrumentedDialogFragment { protected static final String TAG = "ZenDeleteRuleDialog"; private static final String EXTRA_ZEN_RULE_NAME = "zen_rule_name"; diff --git a/src/com/android/settings/notification/ZenDurationDialogPreference.java b/src/com/android/settings/notification/ZenDurationDialogPreference.java index a161d6ead41..6d6d085cf99 100644 --- a/src/com/android/settings/notification/ZenDurationDialogPreference.java +++ b/src/com/android/settings/notification/ZenDurationDialogPreference.java @@ -20,11 +20,11 @@ import android.content.Context; import android.content.DialogInterface; import android.util.AttributeSet; +import androidx.appcompat.app.AlertDialog; + import com.android.settingslib.CustomDialogPreferenceCompat; import com.android.settingslib.notification.ZenDurationDialog; -import androidx.appcompat.app.AlertDialog; - public class ZenDurationDialogPreference extends CustomDialogPreferenceCompat { public ZenDurationDialogPreference(Context context, AttributeSet attrs, int defStyleAttr, diff --git a/src/com/android/settings/notification/ZenFooterPreferenceController.java b/src/com/android/settings/notification/ZenFooterPreferenceController.java index be66f26ab64..15a2252397c 100644 --- a/src/com/android/settings/notification/ZenFooterPreferenceController.java +++ b/src/com/android/settings/notification/ZenFooterPreferenceController.java @@ -19,12 +19,12 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; -import com.android.settings.R; -import com.android.settingslib.core.lifecycle.Lifecycle; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.R; +import com.android.settingslib.core.lifecycle.Lifecycle; + public class ZenFooterPreferenceController extends AbstractZenModePreferenceController { public ZenFooterPreferenceController(Context context, Lifecycle lifecycle, diff --git a/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java b/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java index ffe07ee9581..c5ddf485816 100644 --- a/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.notification; import android.content.Context; import android.content.Intent; -import com.android.settings.utils.ZenServiceListing; -import com.android.settingslib.core.lifecycle.Lifecycle; - import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.utils.ZenServiceListing; +import com.android.settingslib.core.lifecycle.Lifecycle; + public class ZenModeAddAutomaticRulePreferenceController extends AbstractZenModeAutomaticRulePreferenceController implements Preference.OnPreferenceClickListener { diff --git a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java b/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java index 8d844d1d84f..96495dfbf76 100644 --- a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java @@ -21,12 +21,12 @@ import android.content.Context; import android.provider.Settings; import android.util.Log; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settingslib.core.lifecycle.Lifecycle; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.internal.logging.nano.MetricsProto; +import com.android.settingslib.core.lifecycle.Lifecycle; + public class ZenModeAlarmsPreferenceController extends AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java b/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java index 665d5e957cf..7679b0bf8a4 100644 --- a/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java @@ -19,16 +19,16 @@ package com.android.settings.notification; import android.app.AutomaticZenRule; import android.content.Context; -import com.android.settingslib.core.lifecycle.Lifecycle; - -import java.util.Map; - import androidx.annotation.VisibleForTesting; import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; +import com.android.settingslib.core.lifecycle.Lifecycle; + +import java.util.Map; + public class ZenModeAutomaticRulesPreferenceController extends AbstractZenModeAutomaticRulePreferenceController { diff --git a/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java b/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java index d747e8c2a3e..4220a42c7fd 100644 --- a/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java @@ -18,11 +18,11 @@ package com.android.settings.notification; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; - public class ZenModeAutomationPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java index ee85c4e40c9..44bc5f1eb68 100644 --- a/src/com/android/settings/notification/ZenModeAutomationSettings.java +++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java @@ -20,6 +20,8 @@ import android.content.Context; import android.provider.SearchIndexableResource; import android.service.notification.ConditionProviderService; +import androidx.fragment.app.Fragment; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; @@ -33,8 +35,6 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; -import androidx.fragment.app.Fragment; - @SearchIndexable public class ZenModeAutomationSettings extends ZenModeSettingsBase { protected final ManagedServiceSettings.Config CONFIG = getConditionProviderConfig(); diff --git a/src/com/android/settings/notification/ZenModeBackend.java b/src/com/android/settings/notification/ZenModeBackend.java index d63bed47637..de30e5dae09 100644 --- a/src/com/android/settings/notification/ZenModeBackend.java +++ b/src/com/android/settings/notification/ZenModeBackend.java @@ -28,10 +28,10 @@ import android.provider.Settings; import android.service.notification.ZenModeConfig; import android.util.Log; -import com.android.settings.R; - import androidx.annotation.VisibleForTesting; +import com.android.settings.R; + public class ZenModeBackend { @VisibleForTesting protected static final String ZEN_MODE_FROM_ANYONE = "zen_mode_from_anyone"; diff --git a/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java index 55c621f4b47..0dba4d6dd5d 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java @@ -18,11 +18,11 @@ package com.android.settings.notification; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; -import androidx.preference.Preference; - public class ZenModeBehaviorCallsPreferenceController extends AbstractZenModePreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java index 5353e91575f..e9f74d2880c 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java @@ -22,11 +22,11 @@ import android.net.Uri; import android.provider.Settings; import android.service.notification.ZenModeConfig; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settingslib.core.lifecycle.Lifecycle; -import androidx.preference.Preference; - public class ZenModeBehaviorFooterPreferenceController extends AbstractZenModePreferenceController { protected static final String KEY = "footer_preference"; diff --git a/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java index 93466549819..2046244c622 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java @@ -18,11 +18,11 @@ package com.android.settings.notification; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; -import androidx.preference.Preference; - public class ZenModeBehaviorMsgEventReminderPreferenceController extends AbstractZenModePreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java index 16426ffebe6..425f7709374 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java @@ -18,11 +18,11 @@ package com.android.settings.notification; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; -import androidx.preference.Preference; - public class ZenModeBehaviorSoundPreferenceController extends AbstractZenModePreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/ZenModeButtonPreferenceController.java b/src/com/android/settings/notification/ZenModeButtonPreferenceController.java index 03e63e3a648..3e45899b2ed 100644 --- a/src/com/android/settings/notification/ZenModeButtonPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeButtonPreferenceController.java @@ -21,15 +21,15 @@ import android.provider.Settings; import android.view.View; import android.widget.Button; +import androidx.fragment.app.FragmentManager; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; -import androidx.fragment.app.FragmentManager; -import androidx.preference.Preference; - public class ZenModeButtonPreferenceController extends AbstractZenModePreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java index ced28cd126d..3f689d7b4f2 100644 --- a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java @@ -21,14 +21,14 @@ import android.content.Context; import android.provider.Settings; import android.text.TextUtils; -import com.android.settings.R; -import com.android.settingslib.core.lifecycle.Lifecycle; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.R; +import com.android.settingslib.core.lifecycle.Lifecycle; + public class ZenModeCallsPreferenceController extends AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/ZenModeEventRuleSettings.java b/src/com/android/settings/notification/ZenModeEventRuleSettings.java index a6aba11d057..e859cdd1b27 100644 --- a/src/com/android/settings/notification/ZenModeEventRuleSettings.java +++ b/src/com/android/settings/notification/ZenModeEventRuleSettings.java @@ -27,6 +27,11 @@ import android.provider.Settings; import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig.EventInfo; +import androidx.preference.DropDownPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; @@ -36,11 +41,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import androidx.preference.DropDownPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceScreen; - public class ZenModeEventRuleSettings extends ZenModeRuleSettingsBase { private static final String KEY_CALENDAR = "calendar"; private static final String KEY_REPLY = "reply"; diff --git a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java b/src/com/android/settings/notification/ZenModeEventsPreferenceController.java index e1aa28cdfd0..235ebd5b004 100644 --- a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeEventsPreferenceController.java @@ -21,12 +21,12 @@ import android.content.Context; import android.provider.Settings; import android.util.Log; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settingslib.core.lifecycle.Lifecycle; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.internal.logging.nano.MetricsProto; +import com.android.settingslib.core.lifecycle.Lifecycle; + public class ZenModeEventsPreferenceController extends AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/ZenModeMediaPreferenceController.java b/src/com/android/settings/notification/ZenModeMediaPreferenceController.java index d4b9371433f..2bec84f9c75 100644 --- a/src/com/android/settings/notification/ZenModeMediaPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeMediaPreferenceController.java @@ -21,11 +21,11 @@ import android.content.Context; import android.provider.Settings; import android.util.Log; -import com.android.settingslib.core.lifecycle.Lifecycle; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settingslib.core.lifecycle.Lifecycle; + public class ZenModeMediaPreferenceController extends AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java b/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java index 1e2bdc22048..321d94efa7f 100644 --- a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java @@ -5,14 +5,14 @@ import android.content.Context; import android.provider.Settings; import android.text.TextUtils; -import com.android.settings.R; -import com.android.settingslib.core.lifecycle.Lifecycle; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.R; +import com.android.settingslib.core.lifecycle.Lifecycle; + public class ZenModeMessagesPreferenceController extends AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/ZenModePreferenceController.java b/src/com/android/settings/notification/ZenModePreferenceController.java index d70ffe28b8b..44ad2ffb6d1 100644 --- a/src/com/android/settings/notification/ZenModePreferenceController.java +++ b/src/com/android/settings/notification/ZenModePreferenceController.java @@ -24,14 +24,14 @@ import android.os.Handler; import android.os.UserHandle; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class ZenModePreferenceController extends BasePreferenceController implements LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java b/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java index cc332f62b7f..41f1eb1c6ec 100644 --- a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java @@ -21,12 +21,12 @@ import android.content.Context; import android.provider.Settings; import android.util.Log; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settingslib.core.lifecycle.Lifecycle; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.internal.logging.nano.MetricsProto; +import com.android.settingslib.core.lifecycle.Lifecycle; + public class ZenModeRemindersPreferenceController extends AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java b/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java index 4a384b154b3..db5c6e1b3e8 100644 --- a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java @@ -21,14 +21,14 @@ import android.content.Context; import android.provider.Settings; import android.util.Log; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.R; -import com.android.settingslib.core.lifecycle.Lifecycle; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.R; +import com.android.settingslib.core.lifecycle.Lifecycle; + public class ZenModeRepeatCallersPreferenceController extends AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java index 0aaf310b6b2..9e5dbc33042 100644 --- a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java +++ b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java @@ -26,12 +26,12 @@ import android.service.notification.ConditionProviderService; import android.util.Log; import android.widget.Toast; -import com.android.settings.R; -import com.android.settingslib.core.AbstractPreferenceController; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.R; +import com.android.settingslib.core.AbstractPreferenceController; + public abstract class ZenModeRuleSettingsBase extends ZenModeSettingsBase { protected static final String TAG = ZenModeSettingsBase.TAG; diff --git a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java index 1769871fa13..f65a8b00c3d 100644 --- a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java +++ b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java @@ -30,6 +30,13 @@ import android.text.format.DateFormat; import android.util.Log; import android.widget.TimePicker; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.FragmentManager; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -41,13 +48,6 @@ import java.util.Arrays; import java.util.Calendar; import java.util.List; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.FragmentManager; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase { private static final String KEY_DAYS = "days"; private static final String KEY_START_TIME = "start_time"; diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index f2ebd2b85aa..9cd310724bf 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -34,6 +34,9 @@ import android.provider.SearchIndexableResource; import android.provider.Settings; import android.service.notification.ZenModeConfig; +import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.FragmentManager; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; @@ -49,9 +52,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.function.Predicate; -import androidx.annotation.VisibleForTesting; -import androidx.fragment.app.FragmentManager; - @SearchIndexable public class ZenModeSettings extends ZenModeSettingsBase { @Override diff --git a/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java b/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java index 462320fa3a6..6d5aac915da 100644 --- a/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java @@ -21,11 +21,11 @@ import android.net.Uri; import android.provider.Settings; import android.service.notification.ZenModeConfig; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settingslib.core.lifecycle.Lifecycle; -import androidx.preference.Preference; - public class ZenModeSettingsFooterPreferenceController extends AbstractZenModePreferenceController { protected static final String KEY = "footer_preference"; diff --git a/src/com/android/settings/notification/ZenModeSliceBuilder.java b/src/com/android/settings/notification/ZenModeSliceBuilder.java index dcdf6ef10eb..bd6ad0bd618 100644 --- a/src/com/android/settings/notification/ZenModeSliceBuilder.java +++ b/src/com/android/settings/notification/ZenModeSliceBuilder.java @@ -29,6 +29,12 @@ import android.net.Uri; import android.provider.Settings; import android.provider.SettingsSlicesContract; +import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.builders.ListBuilder; +import androidx.slice.builders.ListBuilder.RowBuilder; +import androidx.slice.builders.SliceAction; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SubSettings; @@ -37,12 +43,6 @@ import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.slices.SliceBroadcastReceiver; import com.android.settings.slices.SliceBuilderUtils; -import androidx.core.graphics.drawable.IconCompat; -import androidx.slice.Slice; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.ListBuilder.RowBuilder; -import androidx.slice.builders.SliceAction; - public class ZenModeSliceBuilder { private static final String TAG = "ZenModeSliceBuilder"; diff --git a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java b/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java index 1813a57fc59..adb65b6093d 100644 --- a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java @@ -28,16 +28,16 @@ import android.icu.text.ListFormatter; import android.provider.Contacts; import android.provider.ContactsContract; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class ZenModeStarredContactsPreferenceController extends AbstractZenModePreferenceController implements Preference.OnPreferenceClickListener { diff --git a/src/com/android/settings/notification/ZenModeSystemPreferenceController.java b/src/com/android/settings/notification/ZenModeSystemPreferenceController.java index 36b017f68d9..73907b9fffd 100644 --- a/src/com/android/settings/notification/ZenModeSystemPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeSystemPreferenceController.java @@ -21,12 +21,12 @@ import android.content.Context; import android.provider.Settings; import android.util.Log; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settingslib.core.lifecycle.Lifecycle; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.internal.logging.nano.MetricsProto; +import com.android.settingslib.core.lifecycle.Lifecycle; + public class ZenModeSystemPreferenceController extends AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java index 37cf99c97ad..e3098f0e22f 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java @@ -19,14 +19,14 @@ package com.android.settings.notification; import android.app.NotificationManager; import android.content.Context; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settings.widget.DisabledCheckBoxPreference; -import com.android.settingslib.core.lifecycle.Lifecycle; - import androidx.preference.CheckBoxPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settings.widget.DisabledCheckBoxPreference; +import com.android.settingslib.core.lifecycle.Lifecycle; + public class ZenModeVisEffectPreferenceController extends AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java index 00d2477d73e..66b2c7bc1a4 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java @@ -19,12 +19,12 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settingslib.core.lifecycle.Lifecycle; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.internal.logging.nano.MetricsProto; +import com.android.settingslib.core.lifecycle.Lifecycle; + public class ZenModeVisEffectsAllPreferenceController extends AbstractZenModePreferenceController implements ZenCustomRadioButtonPreference.OnRadioButtonClickListener { diff --git a/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java index 86790f2852f..414465f2cee 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java @@ -19,14 +19,14 @@ package com.android.settings.notification; import android.app.NotificationManager; import android.content.Context; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settingslib.core.lifecycle.Lifecycle; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class ZenModeVisEffectsCustomPreferenceController extends AbstractZenModePreferenceController { diff --git a/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java index a266141b70b..17fbdb2c5e2 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java @@ -19,12 +19,12 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settingslib.core.lifecycle.Lifecycle; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.internal.logging.nano.MetricsProto; +import com.android.settingslib.core.lifecycle.Lifecycle; + public class ZenModeVisEffectsNonePreferenceController extends AbstractZenModePreferenceController implements ZenCustomRadioButtonPreference.OnRadioButtonClickListener { diff --git a/src/com/android/settings/notification/ZenOnboardingActivity.java b/src/com/android/settings/notification/ZenOnboardingActivity.java index 3f12358f8ef..9e9041599dd 100644 --- a/src/com/android/settings/notification/ZenOnboardingActivity.java +++ b/src/com/android/settings/notification/ZenOnboardingActivity.java @@ -29,14 +29,14 @@ import android.util.Log; import android.view.View; import android.widget.RadioButton; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; import com.android.settings.overlay.FeatureFactory; -import androidx.annotation.VisibleForTesting; - public class ZenOnboardingActivity extends Activity { private static final String TAG = "ZenOnboardingActivity"; diff --git a/src/com/android/settings/notification/ZenRuleNameDialog.java b/src/com/android/settings/notification/ZenRuleNameDialog.java index 62c83cd563e..9ae32ff1e28 100644 --- a/src/com/android/settings/notification/ZenRuleNameDialog.java +++ b/src/com/android/settings/notification/ZenRuleNameDialog.java @@ -27,13 +27,13 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.EditText; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; - public class ZenRuleNameDialog extends InstrumentedDialogFragment { protected static final String TAG = "ZenRuleNameDialog"; private static final String EXTRA_ZEN_RULE_NAME = "zen_rule_name"; diff --git a/src/com/android/settings/notification/ZenRulePreference.java b/src/com/android/settings/notification/ZenRulePreference.java index e0873c51ce0..8058e6cc319 100644 --- a/src/com/android/settings/notification/ZenRulePreference.java +++ b/src/com/android/settings/notification/ZenRulePreference.java @@ -25,6 +25,10 @@ import android.content.pm.ServiceInfo; import android.service.notification.ZenModeConfig; import android.view.View; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.utils.ManagedServiceSettings; @@ -34,10 +38,6 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import java.util.Map; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - public class ZenRulePreference extends TwoTargetPreference { private static final ManagedServiceSettings.Config CONFIG = ZenModeAutomationSettings.getConditionProviderConfig(); diff --git a/src/com/android/settings/notification/ZenRuleSelectionDialog.java b/src/com/android/settings/notification/ZenRuleSelectionDialog.java index b1a3939b98c..b076dd0e671 100644 --- a/src/com/android/settings/notification/ZenRuleSelectionDialog.java +++ b/src/com/android/settings/notification/ZenRuleSelectionDialog.java @@ -36,6 +36,9 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; + import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.utils.ZenServiceListing; @@ -46,9 +49,6 @@ import java.util.Comparator; import java.util.Set; import java.util.TreeSet; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; - public class ZenRuleSelectionDialog extends InstrumentedDialogFragment { private static final String TAG = "ZenRuleSelectionDialog"; private static final boolean DEBUG = ZenModeSettings.DEBUG; diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java index a45bea77ead..21d14905213 100644 --- a/src/com/android/settings/password/ChooseLockGeneric.java +++ b/src/com/android/settings/password/ChooseLockGeneric.java @@ -18,6 +18,7 @@ package com.android.settings.password; import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PARENT_PROFILE_PASSWORD; import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PASSWORD; + import static com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment .RESULT_FINISHED; @@ -43,6 +44,14 @@ import android.util.Log; import android.view.accessibility.AccessibilityManager; import android.widget.TextView; +import androidx.annotation.StringRes; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.EncryptionInterstitial; @@ -60,14 +69,6 @@ import com.android.settingslib.RestrictedPreference; import java.util.List; -import androidx.annotation.StringRes; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class ChooseLockGeneric extends SettingsActivity { public static final String CONFIRM_CREDENTIALS = "confirm_credentials"; diff --git a/src/com/android/settings/password/ChooseLockGenericController.java b/src/com/android/settings/password/ChooseLockGenericController.java index a9b2e00c218..eb7ff4e5fa1 100644 --- a/src/com/android/settings/password/ChooseLockGenericController.java +++ b/src/com/android/settings/password/ChooseLockGenericController.java @@ -20,14 +20,14 @@ import android.app.admin.DevicePolicyManager; import android.content.Context; import android.os.UserHandle; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import java.util.ArrayList; import java.util.List; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; - /** * A controller for ChooseLockGeneric, and other similar classes which shows a list of possible * screen locks for the user to choose from. diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java index f65b3adc8c8..cd041933dcd 100644 --- a/src/com/android/settings/password/ChooseLockPassword.java +++ b/src/com/android/settings/password/ChooseLockPassword.java @@ -51,6 +51,11 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; +import androidx.annotation.StringRes; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils.RequestThrottledException; @@ -68,11 +73,6 @@ import com.android.setupwizardlib.GlifLayout; import java.util.ArrayList; import java.util.List; -import androidx.annotation.StringRes; -import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - public class ChooseLockPassword extends SettingsActivity { private static final String TAG = "ChooseLockPassword"; diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java index a6cf36fb99a..4e4730f73b4 100644 --- a/src/com/android/settings/password/ChooseLockPattern.java +++ b/src/com/android/settings/password/ChooseLockPattern.java @@ -32,6 +32,8 @@ import android.widget.LinearLayout; import android.widget.ScrollView; import android.widget.TextView; +import androidx.fragment.app.Fragment; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient; import com.android.internal.widget.LockPatternUtils; @@ -54,8 +56,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import androidx.fragment.app.Fragment; - /** * If the user has a lock pattern set already, makes them confirm the existing one. * diff --git a/src/com/android/settings/password/ChooseLockSettingsHelper.java b/src/com/android/settings/password/ChooseLockSettingsHelper.java index 652db174179..3c83f071760 100644 --- a/src/com/android/settings/password/ChooseLockSettingsHelper.java +++ b/src/com/android/settings/password/ChooseLockSettingsHelper.java @@ -25,14 +25,14 @@ import android.content.IntentSender; import android.os.Bundle; import android.os.UserManager; +import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.SettingsActivity; import com.android.settings.Utils; import com.android.setupwizardlib.util.WizardManagerHelper; -import androidx.annotation.VisibleForTesting; -import androidx.fragment.app.Fragment; - public final class ChooseLockSettingsHelper { public static final String EXTRA_KEY_TYPE = "type"; diff --git a/src/com/android/settings/password/ChooseLockTypeDialogFragment.java b/src/com/android/settings/password/ChooseLockTypeDialogFragment.java index 8969eec7d6a..10c73c575f5 100644 --- a/src/com/android/settings/password/ChooseLockTypeDialogFragment.java +++ b/src/com/android/settings/password/ChooseLockTypeDialogFragment.java @@ -31,6 +31,9 @@ import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog.Builder; +import androidx.fragment.app.Fragment; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; @@ -40,9 +43,6 @@ import com.android.setupwizardlib.util.WizardManagerHelper; import java.util.List; -import androidx.appcompat.app.AlertDialog.Builder; -import androidx.fragment.app.Fragment; - /** * A dialog fragment similar to {@link ChooseLockGeneric} where the user can select from a few * lock screen types. diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java index 3818ac9017f..cae3ae64d56 100644 --- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java +++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java @@ -23,13 +23,13 @@ import android.view.MenuItem; import android.view.WindowManager; import android.widget.LinearLayout; +import androidx.fragment.app.Fragment; + import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SetupWizardUtils; import com.android.settings.Utils; -import androidx.fragment.app.Fragment; - public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivity { private static final String STATE_IS_KEYGUARD_LOCKED = "STATE_IS_KEYGUARD_LOCKED"; diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java index 23bc26f3daf..a9542e5af64 100644 --- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java +++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java @@ -46,16 +46,16 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.FragmentManager; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.biometrics.fingerprint.FingerprintUiHelper; import com.android.settings.core.InstrumentedFragment; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.DialogFragment; -import androidx.fragment.app.FragmentManager; - /** * Base fragment to be shared for PIN/Pattern/Password confirmation fragments. */ diff --git a/src/com/android/settings/password/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java index b38122663c1..38561fb427b 100644 --- a/src/com/android/settings/password/ConfirmLockPassword.java +++ b/src/com/android/settings/password/ConfirmLockPassword.java @@ -39,6 +39,8 @@ import android.view.inputmethod.InputMethodManager; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; +import androidx.fragment.app.Fragment; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternChecker; import com.android.internal.widget.LockPatternUtils; @@ -50,8 +52,6 @@ import com.android.settingslib.animation.DisappearAnimationUtils; import java.util.ArrayList; -import androidx.fragment.app.Fragment; - public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { // The index of the array is isStrongAuth << 2 + isProfile << 1 + isAlpha. diff --git a/src/com/android/settings/password/PasswordRequirementAdapter.java b/src/com/android/settings/password/PasswordRequirementAdapter.java index 62ddd75a2ad..0e194afca16 100644 --- a/src/com/android/settings/password/PasswordRequirementAdapter.java +++ b/src/com/android/settings/password/PasswordRequirementAdapter.java @@ -21,11 +21,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.password.PasswordRequirementAdapter.PasswordRequirementViewHolder; -import androidx.recyclerview.widget.RecyclerView; - /** * Used in {@link ChooseLockPassword} to show password requirements. */ diff --git a/src/com/android/settings/password/SaveChosenLockWorkerBase.java b/src/com/android/settings/password/SaveChosenLockWorkerBase.java index f76ffd932b9..5b6a8120eab 100644 --- a/src/com/android/settings/password/SaveChosenLockWorkerBase.java +++ b/src/com/android/settings/password/SaveChosenLockWorkerBase.java @@ -22,10 +22,10 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.UserManager; -import com.android.internal.widget.LockPatternUtils; - import androidx.fragment.app.Fragment; +import com.android.internal.widget.LockPatternUtils; + /** * An invisible retained worker fragment to track the AsyncWork that saves (and optionally * verifies if a challenge is given) the chosen lock credential (pattern/pin/password). diff --git a/src/com/android/settings/password/SetNewPasswordController.java b/src/com/android/settings/password/SetNewPasswordController.java index 94bc928761f..f3bcedc5744 100644 --- a/src/com/android/settings/password/SetNewPasswordController.java +++ b/src/com/android/settings/password/SetNewPasswordController.java @@ -20,6 +20,7 @@ import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PASSWORD; import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_FACE; import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING; + import static com.android.internal.util.Preconditions.checkNotNull; import android.annotation.Nullable; @@ -34,11 +35,11 @@ import android.os.Bundle; import android.os.IBinder; import android.os.UserManager; +import androidx.annotation.VisibleForTesting; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.Utils; -import androidx.annotation.VisibleForTesting; - /** * Business logic for {@link SetNewPasswordActivity}. * diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java index 1642bf0ff3b..700cc2dde1e 100644 --- a/src/com/android/settings/password/SetupChooseLockGeneric.java +++ b/src/com/android/settings/password/SetupChooseLockGeneric.java @@ -27,6 +27,10 @@ import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragmentCompat; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.SetupEncryptionInterstitial; @@ -35,10 +39,6 @@ import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSen import com.android.settings.utils.SettingsDividerItemDecoration; import com.android.setupwizardlib.GlifPreferenceLayout; -import androidx.preference.Preference; -import androidx.preference.PreferenceFragmentCompat; -import androidx.recyclerview.widget.RecyclerView; - /** * Setup Wizard's version of ChooseLockGeneric screen. It inherits the logic and basic structure * from ChooseLockGeneric class, and should remain similar to that behaviorally. This class should diff --git a/src/com/android/settings/password/SetupChooseLockPassword.java b/src/com/android/settings/password/SetupChooseLockPassword.java index 56c6a7b3b3c..b96c57dfcbf 100644 --- a/src/com/android/settings/password/SetupChooseLockPassword.java +++ b/src/com/android/settings/password/SetupChooseLockPassword.java @@ -26,13 +26,13 @@ import android.view.View; import android.widget.Button; import android.widget.LinearLayout; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import com.android.settings.R; import com.android.settings.SetupRedactionInterstitial; import com.android.settings.password.ChooseLockTypeDialogFragment.OnLockTypeSelectedListener; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; - /** * Setup Wizard's version of ChooseLockPassword screen. It inherits the logic and basic structure * from ChooseLockPassword class, and should remain similar to that behaviorally. This class should diff --git a/src/com/android/settings/password/SetupChooseLockPattern.java b/src/com/android/settings/password/SetupChooseLockPattern.java index cc1633a16f3..696380c70e1 100644 --- a/src/com/android/settings/password/SetupChooseLockPattern.java +++ b/src/com/android/settings/password/SetupChooseLockPattern.java @@ -24,12 +24,12 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import com.android.settings.R; -import com.android.settings.SetupRedactionInterstitial; - import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; +import com.android.settings.R; +import com.android.settings.SetupRedactionInterstitial; + /** * Setup Wizard's version of ChooseLockPattern screen. It inherits the logic and basic structure * from ChooseLockPattern class, and should remain similar to that behaviorally. This class should diff --git a/src/com/android/settings/password/SetupSkipDialog.java b/src/com/android/settings/password/SetupSkipDialog.java index c93d12d0160..ad28ddbe8f4 100644 --- a/src/com/android/settings/password/SetupSkipDialog.java +++ b/src/com/android/settings/password/SetupSkipDialog.java @@ -21,14 +21,14 @@ import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.R; -import com.android.settings.core.instrumentation.InstrumentedDialogFragment; - import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentManager; +import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.R; +import com.android.settings.core.instrumentation.InstrumentedDialogFragment; + public class SetupSkipDialog extends InstrumentedDialogFragment implements DialogInterface.OnClickListener { diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java index 10759cedf09..ba0172ba560 100644 --- a/src/com/android/settings/print/PrintJobSettingsFragment.java +++ b/src/com/android/settings/print/PrintJobSettingsFragment.java @@ -35,14 +35,14 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import java.text.DateFormat; -import androidx.preference.Preference; - /** * Fragment for management of a print job. */ diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java index 345b4aea927..759cf3bb59b 100644 --- a/src/com/android/settings/print/PrintServiceSettingsFragment.java +++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java @@ -49,6 +49,12 @@ import android.widget.SearchView; import android.widget.Switch; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -61,12 +67,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import androidx.annotation.NonNull; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.Loader; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver; - /** * Fragment with print service settings. */ diff --git a/src/com/android/settings/print/PrintSettingPreferenceController.java b/src/com/android/settings/print/PrintSettingPreferenceController.java index 3bd80fdf6cd..16c432032f8 100644 --- a/src/com/android/settings/print/PrintSettingPreferenceController.java +++ b/src/com/android/settings/print/PrintSettingPreferenceController.java @@ -25,6 +25,9 @@ import android.print.PrintJobInfo; import android.print.PrintManager; import android.printservice.PrintServiceInfo; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.RestrictedPreference; @@ -34,9 +37,6 @@ import com.android.settingslib.core.lifecycle.events.OnStop; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * {@link BasePreferenceController} for Print settings. */ diff --git a/src/com/android/settings/print/SettingsPrintServicesLoader.java b/src/com/android/settings/print/SettingsPrintServicesLoader.java index 758f4d3f4f0..e94c589d4bb 100644 --- a/src/com/android/settings/print/SettingsPrintServicesLoader.java +++ b/src/com/android/settings/print/SettingsPrintServicesLoader.java @@ -22,12 +22,12 @@ import android.print.PrintManager; import android.print.PrintServicesLoader; import android.printservice.PrintServiceInfo; +import androidx.loader.content.Loader; + import com.android.internal.util.Preconditions; import java.util.List; -import androidx.loader.content.Loader; - /** * Loader for the list of print services. Can be parametrized to select a subset. */ diff --git a/src/com/android/settings/search/DeviceIndexUpdateJobService.java b/src/com/android/settings/search/DeviceIndexUpdateJobService.java index 3a85867f2d1..1f7ee31e6f6 100644 --- a/src/com/android/settings/search/DeviceIndexUpdateJobService.java +++ b/src/com/android/settings/search/DeviceIndexUpdateJobService.java @@ -17,6 +17,7 @@ package com.android.settings.search; import static android.app.slice.Slice.HINT_LARGE; import static android.app.slice.Slice.HINT_TITLE; import static android.app.slice.SliceItem.FORMAT_TEXT; + import static com.android.settings.search.DeviceIndexFeatureProvider.createDeepLink; import android.app.job.JobParameters; @@ -28,13 +29,6 @@ import android.net.Uri.Builder; import android.provider.SettingsSlicesContract; import android.util.Log; -import com.android.settings.overlay.FeatureFactory; -import com.android.settings.slices.SettingsSliceProvider; -import com.android.settings.slices.SliceDeepLinkSpringBoard; - -import java.util.Collection; -import java.util.concurrent.CountDownLatch; - import androidx.annotation.VisibleForTesting; import androidx.slice.Slice; import androidx.slice.SliceItem; @@ -45,6 +39,13 @@ import androidx.slice.core.SliceQuery; import androidx.slice.widget.ListContent; import androidx.slice.widget.SliceContent; +import com.android.settings.overlay.FeatureFactory; +import com.android.settings.slices.SettingsSliceProvider; +import com.android.settings.slices.SliceDeepLinkSpringBoard; + +import java.util.Collection; +import java.util.concurrent.CountDownLatch; + public class DeviceIndexUpdateJobService extends JobService { private static final String TAG = "DeviceIndexUpdate"; diff --git a/src/com/android/settings/search/Indexable.java b/src/com/android/settings/search/Indexable.java index 80489950c3e..eef7184762f 100644 --- a/src/com/android/settings/search/Indexable.java +++ b/src/com/android/settings/search/Indexable.java @@ -19,12 +19,12 @@ package com.android.settings.search; import android.content.Context; import android.provider.SearchIndexableResource; +import androidx.annotation.Keep; + import com.android.settingslib.core.AbstractPreferenceController; import java.util.List; -import androidx.annotation.Keep; - /** * Interface for classes whose instances can provide data for indexing. * diff --git a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java index 26d15f5c53a..0a846de317f 100644 --- a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java +++ b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java @@ -41,6 +41,7 @@ import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS; import static android.provider.SearchIndexablesContract.INDEXABLES_XML_RES_COLUMNS; import static android.provider.SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS; import static android.provider.SearchIndexablesContract.SITE_MAP_COLUMNS; + import static com.android.settings.dashboard.DashboardFragmentRegistry.CATEGORY_KEY_TO_PARENT_MAP; import android.content.Context; diff --git a/src/com/android/settings/search/actionbar/SearchMenuController.java b/src/com/android/settings/search/actionbar/SearchMenuController.java index 54fae7e3a95..6855717cdd8 100644 --- a/src/com/android/settings/search/actionbar/SearchMenuController.java +++ b/src/com/android/settings/search/actionbar/SearchMenuController.java @@ -23,6 +23,8 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.fragment.app.Fragment; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.overlay.FeatureFactory; @@ -32,8 +34,6 @@ import com.android.settingslib.core.lifecycle.ObservableFragment; import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment; import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu; -import androidx.fragment.app.Fragment; - public class SearchMenuController implements LifecycleObserver, OnCreateOptionsMenu { public static final String NEED_SEARCH_ICON_IN_ACTION_BAR = "need_search_icon_in_action_bar"; diff --git a/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java b/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java index 47bd0b8e47f..26370d9f528 100644 --- a/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java +++ b/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java @@ -23,13 +23,13 @@ import android.os.Bundle; import android.os.UserHandle; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.SubSettingLauncher; import com.android.settings.password.ChooseLockGeneric; -import androidx.preference.Preference; - public class ChangeProfileScreenLockPreferenceController extends ChangeScreenLockPreferenceController { diff --git a/src/com/android/settings/security/ChangeScreenLockPreferenceController.java b/src/com/android/settings/security/ChangeScreenLockPreferenceController.java index 1284b6ad6e0..ae857ceafa5 100644 --- a/src/com/android/settings/security/ChangeScreenLockPreferenceController.java +++ b/src/com/android/settings/security/ChangeScreenLockPreferenceController.java @@ -23,6 +23,9 @@ import android.os.UserManager; import android.os.storage.StorageManager; import android.text.TextUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.Utils; @@ -36,9 +39,6 @@ import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class ChangeScreenLockPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, GearPreference.OnGearClickListener { diff --git a/src/com/android/settings/security/ConfigureKeyGuardDialog.java b/src/com/android/settings/security/ConfigureKeyGuardDialog.java index f09e077ce96..01c0e9ec79a 100644 --- a/src/com/android/settings/security/ConfigureKeyGuardDialog.java +++ b/src/com/android/settings/security/ConfigureKeyGuardDialog.java @@ -23,15 +23,15 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.CredentialStorage; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.password.ChooseLockGeneric; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; - /** * Prompt for key guard configuration confirmation. */ diff --git a/src/com/android/settings/security/CredentialStoragePreferenceController.java b/src/com/android/settings/security/CredentialStoragePreferenceController.java index 1df5e9e2902..060d9642e1c 100644 --- a/src/com/android/settings/security/CredentialStoragePreferenceController.java +++ b/src/com/android/settings/security/CredentialStoragePreferenceController.java @@ -20,10 +20,10 @@ import android.content.Context; import android.os.UserManager; import android.security.KeyStore; -import com.android.settings.R; - import androidx.preference.Preference; +import com.android.settings.R; + public class CredentialStoragePreferenceController extends RestrictedEncryptionPreferenceController { diff --git a/src/com/android/settings/security/CryptKeeperSettings.java b/src/com/android/settings/security/CryptKeeperSettings.java index b7c5db79a2a..a0e5a8e66da 100644 --- a/src/com/android/settings/security/CryptKeeperSettings.java +++ b/src/com/android/settings/security/CryptKeeperSettings.java @@ -33,6 +33,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.CryptKeeperConfirm; import com.android.settings.R; @@ -41,9 +44,6 @@ import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.ConfirmLockPattern; -import androidx.appcompat.app.AlertDialog; -import androidx.preference.Preference; - public class CryptKeeperSettings extends InstrumentedPreferenceFragment { private static final String TAG = "CryptKeeper"; private static final String TYPE = "type"; diff --git a/src/com/android/settings/security/EncryptionStatusPreferenceController.java b/src/com/android/settings/security/EncryptionStatusPreferenceController.java index 4128358310e..ea38068648c 100644 --- a/src/com/android/settings/security/EncryptionStatusPreferenceController.java +++ b/src/com/android/settings/security/EncryptionStatusPreferenceController.java @@ -20,12 +20,12 @@ import android.content.Context; import android.os.UserManager; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import androidx.preference.Preference; - public class EncryptionStatusPreferenceController extends BasePreferenceController { diff --git a/src/com/android/settings/security/LockUnificationPreferenceController.java b/src/com/android/settings/security/LockUnificationPreferenceController.java index a8fa744f0a2..71be0aea0b3 100644 --- a/src/com/android/settings/security/LockUnificationPreferenceController.java +++ b/src/com/android/settings/security/LockUnificationPreferenceController.java @@ -28,6 +28,9 @@ import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.Utils; @@ -40,9 +43,6 @@ import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * Controller for password unification/un-unification flows. * diff --git a/src/com/android/settings/security/OwnerInfoPreferenceController.java b/src/com/android/settings/security/OwnerInfoPreferenceController.java index a462916ac98..226e887045a 100644 --- a/src/com/android/settings/security/OwnerInfoPreferenceController.java +++ b/src/com/android/settings/security/OwnerInfoPreferenceController.java @@ -18,6 +18,12 @@ package com.android.settings.security; import android.content.Context; import android.os.UserHandle; +import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceScreen; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.users.OwnerInfoSettings; @@ -29,12 +35,6 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.annotation.VisibleForTesting; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceScreen; - public class OwnerInfoPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnResume { diff --git a/src/com/android/settings/security/ResetCredentialsPreferenceController.java b/src/com/android/settings/security/ResetCredentialsPreferenceController.java index 46355900d07..ee09bcad0e9 100644 --- a/src/com/android/settings/security/ResetCredentialsPreferenceController.java +++ b/src/com/android/settings/security/ResetCredentialsPreferenceController.java @@ -20,13 +20,13 @@ import android.content.Context; import android.os.UserManager; import android.security.KeyStore; +import androidx.preference.PreferenceScreen; + import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.preference.PreferenceScreen; - public class ResetCredentialsPreferenceController extends RestrictedEncryptionPreferenceController implements LifecycleObserver, OnResume { diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java index 8a5144972fc..092ec91ccb8 100644 --- a/src/com/android/settings/security/ScreenPinningSettings.java +++ b/src/com/android/settings/security/ScreenPinningSettings.java @@ -27,6 +27,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Switch; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; @@ -40,11 +45,6 @@ import com.android.settingslib.search.SearchIndexable; import java.util.Arrays; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - /** * Screen pinning settings. */ diff --git a/src/com/android/settings/security/SimLockPreferenceController.java b/src/com/android/settings/security/SimLockPreferenceController.java index 03dd9dacaf4..d8d6252e7a3 100644 --- a/src/com/android/settings/security/SimLockPreferenceController.java +++ b/src/com/android/settings/security/SimLockPreferenceController.java @@ -24,13 +24,13 @@ import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class SimLockPreferenceController extends BasePreferenceController { private static final String KEY_SIM_LOCK = "sim_lock_settings"; diff --git a/src/com/android/settings/security/UnificationConfirmationDialog.java b/src/com/android/settings/security/UnificationConfirmationDialog.java index e862bd016fd..ba4065fcd70 100644 --- a/src/com/android/settings/security/UnificationConfirmationDialog.java +++ b/src/com/android/settings/security/UnificationConfirmationDialog.java @@ -20,13 +20,13 @@ import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.FragmentManager; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.FragmentManager; - public class UnificationConfirmationDialog extends InstrumentedDialogFragment { static final String TAG_UNIFICATION_DIALOG = "unification_dialog"; diff --git a/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java b/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java index 117946ae801..2db8c241197 100644 --- a/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java +++ b/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java @@ -24,6 +24,9 @@ import android.os.UserHandle; import android.os.UserManager; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.Utils; import com.android.settings.core.TogglePreferenceController; @@ -35,9 +38,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class VisiblePatternProfilePreferenceController extends TogglePreferenceController implements LifecycleObserver, OnResume { diff --git a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java index f6db1801787..a003d3bab7a 100644 --- a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java +++ b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java @@ -25,6 +25,8 @@ import android.provider.Settings; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; @@ -34,8 +36,6 @@ import com.android.settings.security.trustagent.TrustAgentManager; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; - public class LockAfterTimeoutPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java b/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java index 58576e83482..7d83f4011e3 100644 --- a/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java +++ b/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java @@ -21,6 +21,9 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED import android.content.Context; import android.os.UserHandle; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.core.BasePreferenceController; import com.android.settings.notification.LockScreenNotificationPreferenceController; @@ -28,9 +31,6 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class LockScreenPreferenceController extends BasePreferenceController implements LifecycleObserver, OnResume { diff --git a/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java b/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java index 9f9066774d5..133078c9eec 100644 --- a/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java +++ b/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.security.screenlock; import android.app.admin.DevicePolicyManager; import android.content.Context; +import androidx.preference.Preference; +import androidx.preference.TwoStatePreference; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; -import androidx.preference.TwoStatePreference; - public class PatternVisiblePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java index 54a13c2a985..ffd01830dae 100644 --- a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java +++ b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java @@ -20,6 +20,9 @@ import android.app.admin.DevicePolicyManager; import android.content.Context; import android.text.TextUtils; +import androidx.preference.Preference; +import androidx.preference.TwoStatePreference; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; @@ -27,9 +30,6 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settings.security.trustagent.TrustAgentManager; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.preference.Preference; -import androidx.preference.TwoStatePreference; - public class PowerButtonInstantLockPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java b/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java index ca3208c4932..056c1f293c2 100644 --- a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java +++ b/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java @@ -19,15 +19,15 @@ package com.android.settings.security.trustagent; import android.content.Context; import android.os.UserHandle; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.overlay.FeatureFactory; import com.android.settings.security.SecurityFeatureProvider; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - public class ManageTrustAgentsPreferenceController extends BasePreferenceController { @VisibleForTesting diff --git a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java index ab9099c9663..6f5d7eb955a 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java +++ b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java @@ -25,6 +25,11 @@ import android.os.Bundle; import android.os.UserHandle; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; @@ -42,11 +47,6 @@ import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - public class TrustAgentListPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnSaveInstanceState, OnCreate, OnResume { diff --git a/src/com/android/settings/security/trustagent/TrustAgentManager.java b/src/com/android/settings/security/trustagent/TrustAgentManager.java index acce2d8ca97..feac9fa76b2 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentManager.java +++ b/src/com/android/settings/security/trustagent/TrustAgentManager.java @@ -35,6 +35,8 @@ import android.util.Log; import android.util.Slog; import android.util.Xml; +import androidx.annotation.VisibleForTesting; + import com.android.internal.widget.LockPatternUtils; import com.android.settingslib.RestrictedLockUtils; @@ -45,8 +47,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; - /** A manager for trust agent state. */ public class TrustAgentManager { diff --git a/src/com/android/settings/security/trustagent/TrustAgentsPreferenceController.java b/src/com/android/settings/security/trustagent/TrustAgentsPreferenceController.java index 604583b33e7..5088d31594f 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentsPreferenceController.java +++ b/src/com/android/settings/security/trustagent/TrustAgentsPreferenceController.java @@ -32,6 +32,10 @@ import android.util.ArrayMap; import android.util.ArraySet; import android.util.IconDrawableFactory; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.core.BasePreferenceController; import com.android.settings.overlay.FeatureFactory; @@ -43,10 +47,6 @@ import com.android.settingslib.core.lifecycle.events.OnStart; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - public class TrustAgentsPreferenceController extends BasePreferenceController implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnStart { diff --git a/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java b/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java index 4848bf6b049..3576034b710 100644 --- a/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java +++ b/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java @@ -37,6 +37,11 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.ImageView; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceGroup; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Settings.TetherSettingsActivity; @@ -49,11 +54,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceGroup; - /** * {@link BasePreferenceController} that populates a list of widgets that Settings app support. */ diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java index 803e1cf36fb..8a99e66712b 100644 --- a/src/com/android/settings/sim/SimDialogActivity.java +++ b/src/com/android/settings/sim/SimDialogActivity.java @@ -38,14 +38,14 @@ import android.widget.ListAdapter; import android.widget.TextView; import android.widget.Toast; +import androidx.appcompat.app.AlertDialog; + import com.android.settings.R; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import androidx.appcompat.app.AlertDialog; - public class SimDialogActivity extends Activity { private static String TAG = "SimDialogActivity"; diff --git a/src/com/android/settings/sim/SimPreferenceDialog.java b/src/com/android/settings/sim/SimPreferenceDialog.java index a657a6bfca4..0f22d2bfe27 100644 --- a/src/com/android/settings/sim/SimPreferenceDialog.java +++ b/src/com/android/settings/sim/SimPreferenceDialog.java @@ -38,11 +38,11 @@ import android.widget.ImageView; import android.widget.Spinner; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; + import com.android.settings.R; import com.android.settings.Utils; -import androidx.appcompat.app.AlertDialog; - public class SimPreferenceDialog extends Activity { private Context mContext; diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java index 4cc3c31e92c..6806f9f0857 100644 --- a/src/com/android/settings/sim/SimSelectNotification.java +++ b/src/com/android/settings/sim/SimSelectNotification.java @@ -28,6 +28,8 @@ import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.util.Log; +import androidx.core.app.NotificationCompat; + import com.android.internal.telephony.IccCardConstants; import com.android.settings.R; import com.android.settings.Settings.SimSettingsActivity; @@ -35,8 +37,6 @@ import com.android.settings.Utils; import java.util.List; -import androidx.core.app.NotificationCompat; - public class SimSelectNotification extends BroadcastReceiver { private static final String TAG = "SimSelectNotification"; private static final int NOTIFICATION_ID = 1; diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index fa65b07cd3e..cf6d5f3fc4c 100644 --- a/src/com/android/settings/sim/SimSettings.java +++ b/src/com/android/settings/sim/SimSettings.java @@ -33,6 +33,9 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.TelephonyProperties; import com.android.settings.R; @@ -45,9 +48,6 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @SearchIndexable public class SimSettings extends RestrictedSettingsFragment implements Indexable { private static final String TAG = "SimSettings"; diff --git a/src/com/android/settings/slices/CustomSliceable.java b/src/com/android/settings/slices/CustomSliceable.java index 52bed23935e..48b5d161db0 100644 --- a/src/com/android/settings/slices/CustomSliceable.java +++ b/src/com/android/settings/slices/CustomSliceable.java @@ -22,11 +22,11 @@ import android.content.Intent; import android.content.IntentFilter; import android.net.Uri; +import androidx.slice.Slice; + import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import androidx.slice.Slice; - /** * Common functions for custom Slices. diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java index 10cc5b45252..f0439a893f2 100644 --- a/src/com/android/settings/slices/SettingsSliceProvider.java +++ b/src/com/android/settings/slices/SettingsSliceProvider.java @@ -32,6 +32,10 @@ import android.util.KeyValueListParser; import android.util.Log; import android.util.Pair; +import androidx.annotation.VisibleForTesting; +import androidx.slice.Slice; +import androidx.slice.SliceProvider; + import com.android.settings.bluetooth.BluetoothSliceBuilder; import com.android.settings.core.BasePreferenceController; import com.android.settings.flashlight.FlashlightSliceBuilder; @@ -39,7 +43,6 @@ import com.android.settings.location.LocationSliceBuilder; import com.android.settings.mobilenetwork.Enhanced4gLteSliceHelper; import com.android.settings.notification.ZenModeSliceBuilder; import com.android.settings.overlay.FeatureFactory; -import com.android.settings.core.BasePreferenceController; import com.android.settings.wifi.WifiSlice; import com.android.settings.wifi.calling.WifiCallingSliceHelper; import com.android.settingslib.SliceBroadcastRelay; @@ -56,10 +59,6 @@ import java.util.Set; import java.util.WeakHashMap; import java.util.concurrent.ConcurrentHashMap; -import androidx.annotation.VisibleForTesting; -import androidx.slice.Slice; -import androidx.slice.SliceProvider; - /** * A {@link SliceProvider} for Settings to enabled inline results in system apps. * diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java index b613ca4cb4a..0306fc937f4 100644 --- a/src/com/android/settings/slices/SliceBuilderUtils.java +++ b/src/com/android/settings/slices/SliceBuilderUtils.java @@ -33,6 +33,14 @@ import android.util.ArraySet; import android.util.Log; import android.util.Pair; +import androidx.annotation.VisibleForTesting; +import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.builders.ListBuilder; +import androidx.slice.builders.ListBuilder.InputRangeBuilder; +import androidx.slice.builders.ListBuilder.RowBuilder; +import androidx.slice.builders.SliceAction; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -45,20 +53,11 @@ import com.android.settings.core.TogglePreferenceController; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.AbstractPreferenceController; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import androidx.annotation.VisibleForTesting; -import androidx.core.graphics.drawable.IconCompat; -import androidx.slice.Slice; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.ListBuilder.InputRangeBuilder; -import androidx.slice.builders.ListBuilder.RowBuilder; -import androidx.slice.builders.SliceAction; - /** * Utility class to build Slices objects and Preference Controllers based on the Database managed diff --git a/src/com/android/settings/slices/SliceDataConverter.java b/src/com/android/settings/slices/SliceDataConverter.java index 7b98fe45a67..7c233a6a6ba 100644 --- a/src/com/android/settings/slices/SliceDataConverter.java +++ b/src/com/android/settings/slices/SliceDataConverter.java @@ -39,6 +39,8 @@ import android.util.Log; import android.util.Xml; import android.view.accessibility.AccessibilityManager; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.accessibility.AccessibilitySettings; import com.android.settings.accessibility.AccessibilitySlicePreferenceController; @@ -61,8 +63,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import androidx.annotation.VisibleForTesting; - /** * Converts all Slice sources into {@link SliceData}. * This includes: diff --git a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java index eeec5a0240c..5d36d737134 100644 --- a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java +++ b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java @@ -16,7 +16,6 @@ package com.android.settings.slices; import android.app.Activity; import android.content.Intent; -import android.content.IntentFilter; import android.net.Uri; import android.os.Bundle; import android.provider.Settings; @@ -26,7 +25,6 @@ import com.android.settings.bluetooth.BluetoothSliceBuilder; import com.android.settings.location.LocationSliceBuilder; import com.android.settings.notification.ZenModeSliceBuilder; import com.android.settings.overlay.FeatureFactory; -import com.android.settings.wifi.WifiSlice; import java.net.URISyntaxException; diff --git a/src/com/android/settings/slices/SliceRelayReceiver.java b/src/com/android/settings/slices/SliceRelayReceiver.java index c8ec12eae85..b4d868dbf2a 100644 --- a/src/com/android/settings/slices/SliceRelayReceiver.java +++ b/src/com/android/settings/slices/SliceRelayReceiver.java @@ -21,6 +21,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.text.TextUtils; + import com.android.settingslib.SliceBroadcastRelay; /** diff --git a/src/com/android/settings/slices/SlicesDatabaseAccessor.java b/src/com/android/settings/slices/SlicesDatabaseAccessor.java index 877c108b323..79d3bc6f007 100644 --- a/src/com/android/settings/slices/SlicesDatabaseAccessor.java +++ b/src/com/android/settings/slices/SlicesDatabaseAccessor.java @@ -25,14 +25,14 @@ import android.net.Uri; import android.os.Binder; import android.util.Pair; +import androidx.slice.Slice; + import com.android.settings.overlay.FeatureFactory; import com.android.settings.slices.SlicesDatabaseHelper.IndexColumns; import java.util.ArrayList; import java.util.List; -import androidx.slice.Slice; - /** * Class used to map a {@link Uri} from {@link SettingsSliceProvider} to a Slice. */ diff --git a/src/com/android/settings/slices/SlicesDatabaseHelper.java b/src/com/android/settings/slices/SlicesDatabaseHelper.java index 4024235b234..f1628e766ce 100644 --- a/src/com/android/settings/slices/SlicesDatabaseHelper.java +++ b/src/com/android/settings/slices/SlicesDatabaseHelper.java @@ -22,10 +22,10 @@ import android.database.sqlite.SQLiteOpenHelper; import android.os.Build; import android.util.Log; -import java.util.Locale; - import androidx.annotation.VisibleForTesting; +import java.util.Locale; + /** * Defines the schema for the Slices database. */ diff --git a/src/com/android/settings/slices/SlicesIndexer.java b/src/com/android/settings/slices/SlicesIndexer.java index a4c27f60338..f88af8fe8f4 100644 --- a/src/com/android/settings/slices/SlicesIndexer.java +++ b/src/com/android/settings/slices/SlicesIndexer.java @@ -21,6 +21,8 @@ import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.core.BasePreferenceController; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.overlay.FeatureFactory; @@ -29,8 +31,6 @@ import com.android.settings.slices.SlicesDatabaseHelper.Tables; import java.util.List; -import androidx.annotation.VisibleForTesting; - /** * Manages the conversion of {@link DashboardFragment} and {@link BasePreferenceController} to * indexable data {@link SliceData} to be stored for Slices. diff --git a/src/com/android/settings/sound/AudioSwitchPreferenceController.java b/src/com/android/settings/sound/AudioSwitchPreferenceController.java index d5e3aff4a4e..f77dfcafc7e 100644 --- a/src/com/android/settings/sound/AudioSwitchPreferenceController.java +++ b/src/com/android/settings/sound/AudioSwitchPreferenceController.java @@ -36,6 +36,10 @@ import android.text.TextUtils; import android.util.FeatureFlagUtils; import android.util.Log; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.bluetooth.Utils; import com.android.settings.core.BasePreferenceController; @@ -56,10 +60,6 @@ import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * Abstract class for audio switcher controller to notify subclass * updating the current status of switcher entry. Subclasses must overwrite diff --git a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java index 348d7d3d0f0..0b50f5f2d75 100644 --- a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java +++ b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java @@ -21,13 +21,13 @@ import static android.bluetooth.IBluetoothHearingAid.HI_SYNC_ID_INVALID; import android.bluetooth.BluetoothDevice; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settingslib.Utils; import com.android.settingslib.bluetooth.HeadsetProfile; import com.android.settingslib.bluetooth.HearingAidProfile; -import androidx.preference.Preference; - /** * This class allows switching between HFP-connected & HAP-connected BT devices * while in on-call state. diff --git a/src/com/android/settings/sound/MediaOutputPreferenceController.java b/src/com/android/settings/sound/MediaOutputPreferenceController.java index dba82ebf4aa..8704243582c 100644 --- a/src/com/android/settings/sound/MediaOutputPreferenceController.java +++ b/src/com/android/settings/sound/MediaOutputPreferenceController.java @@ -24,13 +24,13 @@ import android.bluetooth.BluetoothDevice; import android.content.Context; import android.media.AudioManager; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settingslib.Utils; import com.android.settingslib.bluetooth.A2dpProfile; import com.android.settingslib.bluetooth.HearingAidProfile; -import androidx.preference.Preference; - /** * This class which allows switching between A2dp-connected & HAP-connected BT devices. * A few conditions will disable this switcher: diff --git a/src/com/android/settings/support/actionbar/HelpMenuController.java b/src/com/android/settings/support/actionbar/HelpMenuController.java index 3ac248c7167..498cc3ed529 100644 --- a/src/com/android/settings/support/actionbar/HelpMenuController.java +++ b/src/com/android/settings/support/actionbar/HelpMenuController.java @@ -24,14 +24,14 @@ import android.os.Bundle; import android.view.Menu; import android.view.MenuInflater; +import androidx.fragment.app.Fragment; + import com.android.settingslib.HelpUtils; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.ObservableFragment; import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment; import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu; -import androidx.fragment.app.Fragment; - /** * A controller that adds help menu to any Settings page. */ diff --git a/src/com/android/settings/survey/SurveyMixin.java b/src/com/android/settings/survey/SurveyMixin.java index ab2e21a76cb..5de265347e6 100644 --- a/src/com/android/settings/survey/SurveyMixin.java +++ b/src/com/android/settings/survey/SurveyMixin.java @@ -18,14 +18,14 @@ package com.android.settings.survey; import android.app.Activity; import android.content.BroadcastReceiver; +import androidx.fragment.app.Fragment; + import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.SurveyFeatureProvider; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.fragment.app.Fragment; - /** * attaches extra, survey related work to the onResume method of registered observable classes * in settings. This allows new classes to automatically support settings provided the extend diff --git a/src/com/android/settings/system/SystemUpdatePreferenceController.java b/src/com/android/settings/system/SystemUpdatePreferenceController.java index b2de2b37b84..dd044092c4b 100644 --- a/src/com/android/settings/system/SystemUpdatePreferenceController.java +++ b/src/com/android/settings/system/SystemUpdatePreferenceController.java @@ -29,6 +29,9 @@ import android.telephony.CarrierConfigManager; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.BasePreferenceController; @@ -36,9 +39,6 @@ import com.android.settings.core.BasePreferenceController; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class SystemUpdatePreferenceController extends BasePreferenceController { private static final String TAG = "SysUpdatePrefContr"; diff --git a/src/com/android/settings/tts/TtsEnginePreference.java b/src/com/android/settings/tts/TtsEnginePreference.java index 41684c58061..7dc00fea6c9 100644 --- a/src/com/android/settings/tts/TtsEnginePreference.java +++ b/src/com/android/settings/tts/TtsEnginePreference.java @@ -25,13 +25,13 @@ import android.widget.Checkable; import android.widget.CompoundButton; import android.widget.RadioButton; -import com.android.settings.R; -import com.android.settings.SettingsActivity; - import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; +import com.android.settings.SettingsActivity; + public class TtsEnginePreference extends Preference { diff --git a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java index 01f2e421cd7..27c9547e5e8 100644 --- a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java +++ b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java @@ -11,6 +11,8 @@ import android.speech.tts.TtsEngines; import android.util.Log; import android.widget.Checkable; +import androidx.preference.PreferenceCategory; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -23,8 +25,6 @@ import com.android.settingslib.search.SearchIndexable; import java.util.Arrays; import java.util.List; -import androidx.preference.PreferenceCategory; - @SearchIndexable public class TtsEnginePreferenceFragment extends SettingsPreferenceFragment implements RadioButtonGroupState { diff --git a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java index 2a61cac882f..c097d416d44 100644 --- a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java +++ b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java @@ -18,11 +18,11 @@ package com.android.settings.users; import android.content.Context; import android.provider.Settings; +import androidx.preference.Preference; + import com.android.settings.core.TogglePreferenceController; import com.android.settingslib.RestrictedSwitchPreference; -import androidx.preference.Preference; - public class AddUserWhenLockedPreferenceController extends TogglePreferenceController { private final UserCapabilities mUserCaps; diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java index 15e721aefe5..a4e0cff5c3a 100644 --- a/src/com/android/settings/users/AppRestrictionsFragment.java +++ b/src/com/android/settings/users/AppRestrictionsFragment.java @@ -44,6 +44,15 @@ import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.Switch; +import androidx.preference.ListPreference; +import androidx.preference.MultiSelectListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceViewHolder; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -58,15 +67,6 @@ import java.util.List; import java.util.Set; import java.util.StringTokenizer; -import androidx.preference.ListPreference; -import androidx.preference.MultiSelectListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceViewHolder; -import androidx.preference.SwitchPreference; - public class AppRestrictionsFragment extends SettingsPreferenceFragment implements OnPreferenceChangeListener, OnClickListener, OnPreferenceClickListener, AppRestrictionsHelper.OnDisableUiForPackageListener { diff --git a/src/com/android/settings/users/AutoSyncDataPreferenceController.java b/src/com/android/settings/users/AutoSyncDataPreferenceController.java index 5856f71e1ee..13a2cdf4652 100644 --- a/src/com/android/settings/users/AutoSyncDataPreferenceController.java +++ b/src/com/android/settings/users/AutoSyncDataPreferenceController.java @@ -26,17 +26,17 @@ import android.os.UserHandle; import android.os.UserManager; import android.util.Log; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - public class AutoSyncDataPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java b/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java index de7c24aa8fb..1e6284509a2 100644 --- a/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java +++ b/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java @@ -18,10 +18,10 @@ package com.android.settings.users; import android.content.Context; import android.os.UserHandle; -import com.android.settings.Utils; - import androidx.fragment.app.Fragment; +import com.android.settings.Utils; + public class AutoSyncWorkDataPreferenceController extends AutoSyncPersonalDataPreferenceController { private static final String TAG = "AutoSyncWorkData"; diff --git a/src/com/android/settings/users/EditUserInfoController.java b/src/com/android/settings/users/EditUserInfoController.java index 2035f669063..4d9244aeba5 100644 --- a/src/com/android/settings/users/EditUserInfoController.java +++ b/src/com/android/settings/users/EditUserInfoController.java @@ -34,16 +34,16 @@ import android.view.WindowManager; import android.widget.EditText; import android.widget.ImageView; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; + import com.android.settings.R; import com.android.settingslib.Utils; import com.android.settingslib.drawable.CircleFramedDrawable; import java.io.File; -import androidx.appcompat.app.AlertDialog; -import androidx.annotation.VisibleForTesting; -import androidx.fragment.app.Fragment; - /** * This class encapsulates a Dialog for editing the user nickname and photo. */ diff --git a/src/com/android/settings/users/EditUserPhotoController.java b/src/com/android/settings/users/EditUserPhotoController.java index 4685bb15b3d..f7d7e8633c3 100644 --- a/src/com/android/settings/users/EditUserPhotoController.java +++ b/src/com/android/settings/users/EditUserPhotoController.java @@ -48,6 +48,9 @@ import android.widget.ImageView; import android.widget.ListPopupWindow; import android.widget.TextView; +import androidx.core.content.FileProvider; +import androidx.fragment.app.Fragment; + import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.drawable.CircleFramedDrawable; @@ -63,9 +66,6 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.List; -import androidx.core.content.FileProvider; -import androidx.fragment.app.Fragment; - public class EditUserPhotoController { private static final String TAG = "EditUserPhotoController"; diff --git a/src/com/android/settings/users/MultiUserFooterPreferenceController.java b/src/com/android/settings/users/MultiUserFooterPreferenceController.java index f42f1909d9c..1573bbd08df 100644 --- a/src/com/android/settings/users/MultiUserFooterPreferenceController.java +++ b/src/com/android/settings/users/MultiUserFooterPreferenceController.java @@ -18,14 +18,14 @@ package com.android.settings.users; import android.content.Context; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.FooterPreferenceMixinCompat; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - public class MultiUserFooterPreferenceController extends BasePreferenceController { @VisibleForTesting diff --git a/src/com/android/settings/users/OwnerInfoSettings.java b/src/com/android/settings/users/OwnerInfoSettings.java index 7576917fd26..8915a27560e 100644 --- a/src/com/android/settings/users/OwnerInfoSettings.java +++ b/src/com/android/settings/users/OwnerInfoSettings.java @@ -26,15 +26,15 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.EditText; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.security.OwnerInfoPreferenceController.OwnerInfoCallback; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; - public class OwnerInfoSettings extends InstrumentedDialogFragment implements OnClickListener { private static final String TAG_OWNER_INFO = "ownerInfo"; diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java index 80f493f2619..65868e9653a 100644 --- a/src/com/android/settings/users/UserDetailsSettings.java +++ b/src/com/android/settings/users/UserDetailsSettings.java @@ -24,6 +24,9 @@ import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -32,9 +35,6 @@ import com.android.settingslib.RestrictedLockUtils; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - /** * Settings screen for configuring a specific user. It can contain user restrictions * and deletion controls. It is shown when you tap on the settings icon in the diff --git a/src/com/android/settings/users/UserDialogs.java b/src/com/android/settings/users/UserDialogs.java index 137c938cae4..2361e449a79 100644 --- a/src/com/android/settings/users/UserDialogs.java +++ b/src/com/android/settings/users/UserDialogs.java @@ -30,11 +30,11 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; + import com.android.settings.R; import com.android.settings.Utils; -import androidx.appcompat.app.AlertDialog; - /** * Helper class for displaying dialogs related to user settings. */ diff --git a/src/com/android/settings/users/UserPreference.java b/src/com/android/settings/users/UserPreference.java index 544dd72f172..bcc01675077 100644 --- a/src/com/android/settings/users/UserPreference.java +++ b/src/com/android/settings/users/UserPreference.java @@ -25,14 +25,14 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.ImageView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreference; import java.util.Comparator; -import androidx.preference.PreferenceViewHolder; - public class UserPreference extends RestrictedPreference { private static final int ALPHA_ENABLED = 255; private static final int ALPHA_DISABLED = 102; diff --git a/src/com/android/settings/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java index a448776aa38..6ee5e8e3ac0 100644 --- a/src/com/android/settings/utils/ManagedServiceSettings.java +++ b/src/com/android/settings/utils/ManagedServiceSettings.java @@ -32,6 +32,11 @@ import android.util.IconDrawableFactory; import android.util.Log; import android.view.View; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; @@ -42,11 +47,6 @@ import com.android.settingslib.applications.ServiceListing; import java.util.List; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - public abstract class ManagedServiceSettings extends EmptyTextSettings { private static final String TAG = "ManagedServiceSettings"; private final Config mConfig; diff --git a/src/com/android/settings/utils/SettingsDividerItemDecoration.java b/src/com/android/settings/utils/SettingsDividerItemDecoration.java index 70b0188b8ad..85cd9617b98 100644 --- a/src/com/android/settings/utils/SettingsDividerItemDecoration.java +++ b/src/com/android/settings/utils/SettingsDividerItemDecoration.java @@ -18,11 +18,11 @@ package com.android.settings.utils; import android.content.Context; -import com.android.setupwizardlib.DividerItemDecoration; - import androidx.preference.PreferenceViewHolder; import androidx.recyclerview.widget.RecyclerView; +import com.android.setupwizardlib.DividerItemDecoration; + public class SettingsDividerItemDecoration extends DividerItemDecoration { public SettingsDividerItemDecoration(Context context) { diff --git a/src/com/android/settings/vpn2/AppDialog.java b/src/com/android/settings/vpn2/AppDialog.java index 6641bf3c682..815b28bf27b 100644 --- a/src/com/android/settings/vpn2/AppDialog.java +++ b/src/com/android/settings/vpn2/AppDialog.java @@ -21,10 +21,10 @@ import android.content.DialogInterface; import android.content.pm.PackageInfo; import android.os.Bundle; -import com.android.settings.R; - import androidx.appcompat.app.AlertDialog; +import com.android.settings.R; + /** * UI for managing the connection controlled by an app. * diff --git a/src/com/android/settings/vpn2/AppDialogFragment.java b/src/com/android/settings/vpn2/AppDialogFragment.java index 759adbf5348..0bf5215cebe 100644 --- a/src/com/android/settings/vpn2/AppDialogFragment.java +++ b/src/com/android/settings/vpn2/AppDialogFragment.java @@ -28,14 +28,14 @@ import android.os.UserHandle; import android.os.UserManager; import android.util.Log; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.net.VpnConfig; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; - /** * Fragment wrapper around an {@link AppDialog}. */ diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java index a141919661f..6a80a54623c 100644 --- a/src/com/android/settings/vpn2/AppManagementFragment.java +++ b/src/com/android/settings/vpn2/AppManagementFragment.java @@ -35,6 +35,11 @@ import android.os.UserManager; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.net.VpnConfig; import com.android.internal.util.ArrayUtils; @@ -47,11 +52,6 @@ import com.android.settingslib.RestrictedSwitchPreference; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.DialogFragment; -import androidx.preference.Preference; - public class AppManagementFragment extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener, ConfirmLockdownFragment.ConfirmLockdownListener { diff --git a/src/com/android/settings/vpn2/AppPreference.java b/src/com/android/settings/vpn2/AppPreference.java index e2c26ea61a1..6b64250df32 100644 --- a/src/com/android/settings/vpn2/AppPreference.java +++ b/src/com/android/settings/vpn2/AppPreference.java @@ -22,11 +22,11 @@ import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.os.UserHandle; +import androidx.preference.Preference; + import com.android.internal.net.LegacyVpnInfo; import com.android.internal.net.VpnConfig; -import androidx.preference.Preference; - /** * {@link androidx.preference.Preference} containing information about a VPN * application. Tracks the package name and connection state. diff --git a/src/com/android/settings/vpn2/ConfigDialog.java b/src/com/android/settings/vpn2/ConfigDialog.java index 376dba7da86..de2755e1751 100644 --- a/src/com/android/settings/vpn2/ConfigDialog.java +++ b/src/com/android/settings/vpn2/ConfigDialog.java @@ -33,13 +33,13 @@ import android.widget.CompoundButton; import android.widget.Spinner; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; + import com.android.internal.net.VpnProfile; import com.android.settings.R; import java.net.InetAddress; -import androidx.appcompat.app.AlertDialog; - /** * Dialog showing information about a VPN configuration. The dialog * can be launched to either edit or prompt for credentials to connect diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java index 1517bf748b8..571451554f4 100644 --- a/src/com/android/settings/vpn2/ConfigDialogFragment.java +++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java @@ -31,14 +31,14 @@ import android.util.Log; import android.view.View; import android.widget.Toast; +import androidx.appcompat.app.AlertDialog; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.net.LegacyVpnInfo; import com.android.internal.net.VpnProfile; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import androidx.appcompat.app.AlertDialog; - /** * Fragment wrapper around a {@link ConfigDialog}. */ diff --git a/src/com/android/settings/vpn2/ConfirmLockdownFragment.java b/src/com/android/settings/vpn2/ConfirmLockdownFragment.java index d73e9286fd2..08f37523b6c 100644 --- a/src/com/android/settings/vpn2/ConfirmLockdownFragment.java +++ b/src/com/android/settings/vpn2/ConfirmLockdownFragment.java @@ -19,13 +19,13 @@ import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; - public class ConfirmLockdownFragment extends InstrumentedDialogFragment implements DialogInterface.OnClickListener { public interface ConfirmLockdownListener { diff --git a/src/com/android/settings/vpn2/LegacyVpnPreference.java b/src/com/android/settings/vpn2/LegacyVpnPreference.java index 167cdda9d2b..e44a0570fa7 100644 --- a/src/com/android/settings/vpn2/LegacyVpnPreference.java +++ b/src/com/android/settings/vpn2/LegacyVpnPreference.java @@ -22,11 +22,11 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import androidx.preference.Preference; + import com.android.internal.net.VpnProfile; import com.android.settings.R; -import androidx.preference.Preference; - /** * {@link androidx.preference.Preference} tracks the underlying legacy vpn profile and * its connection state. diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java index 00c4e49be3f..dafa7ec1c92 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -49,6 +49,10 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + import com.android.internal.annotations.GuardedBy; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.net.LegacyVpnInfo; @@ -70,10 +74,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; - /** * Settings screen listing VPNs. Configured VPNs and networks managed by apps * are shown in the same list. diff --git a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java index 8c6286cb0ef..c0473571337 100644 --- a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java +++ b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java @@ -23,12 +23,12 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; -import androidx.annotation.VisibleForTesting; - public class WallpaperSuggestionActivity extends Activity { @Override diff --git a/src/com/android/settings/wallpaper/WallpaperTypePreferenceController.java b/src/com/android/settings/wallpaper/WallpaperTypePreferenceController.java index b7dd84f4442..95797863d43 100644 --- a/src/com/android/settings/wallpaper/WallpaperTypePreferenceController.java +++ b/src/com/android/settings/wallpaper/WallpaperTypePreferenceController.java @@ -23,6 +23,9 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.text.TextUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; @@ -30,9 +33,6 @@ import com.android.settingslib.core.lifecycle.events.OnStart; import java.util.List; import java.util.stream.Collectors; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class WallpaperTypePreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart { diff --git a/src/com/android/settings/webview/WebViewAppPicker.java b/src/com/android/settings/webview/WebViewAppPicker.java index 1dd80fb6e69..b96217e9cf3 100644 --- a/src/com/android/settings/webview/WebViewAppPicker.java +++ b/src/com/android/settings/webview/WebViewAppPicker.java @@ -28,6 +28,8 @@ import android.content.pm.PackageManager; import android.text.TextUtils; import android.webkit.UserPackage; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.defaultapps.DefaultAppPickerFragment; @@ -36,8 +38,6 @@ import com.android.settingslib.applications.DefaultAppInfo; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; - public class WebViewAppPicker extends DefaultAppPickerFragment { private WebViewUpdateServiceWrapper mWebViewUpdateServiceWrapper; diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java index dbb4e21aebe..0bd2a1e9631 100755 --- a/src/com/android/settings/wfd/WifiDisplaySettings.java +++ b/src/com/android/settings/wfd/WifiDisplaySettings.java @@ -50,6 +50,16 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; +import androidx.preference.SwitchPreference; + import com.android.internal.app.MediaRouteDialogPresenter; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -62,16 +72,6 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; -import androidx.appcompat.app.AlertDialog; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; -import androidx.preference.PreferenceViewHolder; -import androidx.preference.SwitchPreference; - /** * The Settings screen for WifiDisplay configuration and connection management. * diff --git a/src/com/android/settings/widget/ActionBarShadowController.java b/src/com/android/settings/widget/ActionBarShadowController.java index 7e2e91ad23c..1b8d3192a4a 100644 --- a/src/com/android/settings/widget/ActionBarShadowController.java +++ b/src/com/android/settings/widget/ActionBarShadowController.java @@ -20,14 +20,14 @@ import android.app.ActionBar; import android.app.Activity; import android.view.View; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.RecyclerView; - /** * A controller that adds shadow to actionbar when content view scrolls. *

diff --git a/src/com/android/settings/widget/ActionButtonPreference.java b/src/com/android/settings/widget/ActionButtonPreference.java index 7f8bd4e0c2e..347a784b2ba 100644 --- a/src/com/android/settings/widget/ActionButtonPreference.java +++ b/src/com/android/settings/widget/ActionButtonPreference.java @@ -22,12 +22,12 @@ import android.util.AttributeSet; import android.view.View; import android.widget.Button; -import com.android.settings.R; - import androidx.annotation.StringRes; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; + public class ActionButtonPreference extends Preference { private final ButtonInfo mButton1Info = new ButtonInfo(); diff --git a/src/com/android/settings/widget/AppCheckBoxPreference.java b/src/com/android/settings/widget/AppCheckBoxPreference.java index bd643ba2481..e56efd93ae7 100644 --- a/src/com/android/settings/widget/AppCheckBoxPreference.java +++ b/src/com/android/settings/widget/AppCheckBoxPreference.java @@ -23,11 +23,11 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.settings.R; - import androidx.preference.CheckBoxPreference; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; + /** * {@link CheckBoxPreference} that used only to display app */ diff --git a/src/com/android/settings/widget/AppPreference.java b/src/com/android/settings/widget/AppPreference.java index 77ff0cc9fa4..91e700a0980 100644 --- a/src/com/android/settings/widget/AppPreference.java +++ b/src/com/android/settings/widget/AppPreference.java @@ -21,11 +21,11 @@ import android.util.AttributeSet; import android.view.View; import android.widget.ProgressBar; -import com.android.settings.R; - import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; + public class AppPreference extends Preference { private int mProgress; diff --git a/src/com/android/settings/widget/AppSwitchPreference.java b/src/com/android/settings/widget/AppSwitchPreference.java index 12aef6dafd3..288096e7f80 100644 --- a/src/com/android/settings/widget/AppSwitchPreference.java +++ b/src/com/android/settings/widget/AppSwitchPreference.java @@ -20,11 +20,11 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; -import com.android.settings.R; - import androidx.preference.PreferenceViewHolder; import androidx.preference.SwitchPreference; +import com.android.settings.R; + public class AppSwitchPreference extends SwitchPreference { public AppSwitchPreference(Context context) { diff --git a/src/com/android/settings/widget/AspectRatioFrameLayout.java b/src/com/android/settings/widget/AspectRatioFrameLayout.java index 066c94a517f..aa3d3c4ea1c 100644 --- a/src/com/android/settings/widget/AspectRatioFrameLayout.java +++ b/src/com/android/settings/widget/AspectRatioFrameLayout.java @@ -19,10 +19,10 @@ import android.content.res.TypedArray; import android.util.AttributeSet; import android.widget.FrameLayout; -import com.android.settings.R; - import androidx.annotation.VisibleForTesting; +import com.android.settings.R; + /** * A {@link FrameLayout} with customizable aspect ratio. * This is used to avoid dynamically calculating the height for the frame. Default aspect diff --git a/src/com/android/settings/widget/BottomLabelLayout.java b/src/com/android/settings/widget/BottomLabelLayout.java index b72be363c17..6323c4dcaa7 100644 --- a/src/com/android/settings/widget/BottomLabelLayout.java +++ b/src/com/android/settings/widget/BottomLabelLayout.java @@ -23,10 +23,10 @@ import android.view.Gravity; import android.view.View; import android.widget.LinearLayout; -import com.android.settingslib.R; - import androidx.annotation.VisibleForTesting; +import com.android.settingslib.R; + /** * An extension of LinearLayout that automatically switches to vertical * orientation when it can't fit its child views horizontally. diff --git a/src/com/android/settings/widget/DonutView.java b/src/com/android/settings/widget/DonutView.java index 458b75c341c..13716636d91 100644 --- a/src/com/android/settings/widget/DonutView.java +++ b/src/com/android/settings/widget/DonutView.java @@ -36,14 +36,14 @@ import android.text.style.RelativeSizeSpan; import android.util.AttributeSet; import android.view.View; +import androidx.annotation.ColorRes; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.Utils; import java.util.Locale; -import androidx.annotation.ColorRes; -import androidx.annotation.VisibleForTesting; - /** * DonutView represents a donut graph. It visualizes a certain percentage of fullness with a * corresponding label with the fullness on the inside (i.e. "50%" inside of the donut). diff --git a/src/com/android/settings/widget/DotsPageIndicator.java b/src/com/android/settings/widget/DotsPageIndicator.java index 633658e6050..88e695105a1 100644 --- a/src/com/android/settings/widget/DotsPageIndicator.java +++ b/src/com/android/settings/widget/DotsPageIndicator.java @@ -34,12 +34,12 @@ import android.util.AttributeSet; import android.view.View; import android.view.animation.Interpolator; +import androidx.viewpager.widget.ViewPager; + import com.android.settings.R; import java.util.Arrays; -import androidx.viewpager.widget.ViewPager; - /** * Custom pager indicator for use with a {@code ViewPager}. */ diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java index 6eaa9b2aab8..b24a75bd639 100644 --- a/src/com/android/settings/widget/EntityHeaderController.java +++ b/src/com/android/settings/widget/EntityHeaderController.java @@ -39,6 +39,11 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.IntDef; +import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.applications.AppInfoBase; @@ -51,11 +56,6 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import androidx.annotation.IntDef; -import androidx.annotation.VisibleForTesting; -import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.RecyclerView; - public class EntityHeaderController { @IntDef({ActionType.ACTION_NONE, diff --git a/src/com/android/settings/widget/FixedLineSummaryPreference.java b/src/com/android/settings/widget/FixedLineSummaryPreference.java index d7d832958bf..534ab08a699 100644 --- a/src/com/android/settings/widget/FixedLineSummaryPreference.java +++ b/src/com/android/settings/widget/FixedLineSummaryPreference.java @@ -20,11 +20,11 @@ import android.text.TextUtils.TruncateAt; import android.util.AttributeSet; import android.widget.TextView; -import com.android.settings.R; - import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; + /** * A preference whose summary text will only span one single line. */ diff --git a/src/com/android/settings/widget/GearPreference.java b/src/com/android/settings/widget/GearPreference.java index c473d41cc2c..0a301006698 100644 --- a/src/com/android/settings/widget/GearPreference.java +++ b/src/com/android/settings/widget/GearPreference.java @@ -20,11 +20,11 @@ import android.content.Context; import android.util.AttributeSet; import android.view.View; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.RestrictedPreference; -import androidx.preference.PreferenceViewHolder; - /** * A preference with a Gear on the side */ diff --git a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java index 0292db9d5e1..313a204e5b6 100644 --- a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java +++ b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java @@ -30,9 +30,6 @@ import android.util.Log; import android.util.TypedValue; import android.view.View; -import com.android.settings.R; -import com.android.settings.SettingsPreferenceFragment; - import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceGroupAdapter; @@ -40,6 +37,9 @@ import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceViewHolder; import androidx.recyclerview.widget.RecyclerView; +import com.android.settings.R; +import com.android.settings.SettingsPreferenceFragment; + public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter { private static final String TAG = "HighlightableAdapter"; diff --git a/src/com/android/settings/widget/LabeledSeekBar.java b/src/com/android/settings/widget/LabeledSeekBar.java index 904a98c03be..14c3d7db012 100644 --- a/src/com/android/settings/widget/LabeledSeekBar.java +++ b/src/com/android/settings/widget/LabeledSeekBar.java @@ -27,12 +27,12 @@ import android.widget.RadioButton; import android.widget.RadioGroup; import android.widget.SeekBar; -import java.util.List; - import androidx.core.view.ViewCompat; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; import androidx.customview.widget.ExploreByTouchHelper; +import java.util.List; + /** * LabeledSeekBar represent a seek bar assigned with labeled, discrete values. * It pretends to be a group of radio button for AccessibilityServices, in order to adjust the diff --git a/src/com/android/settings/widget/MasterCheckBoxPreference.java b/src/com/android/settings/widget/MasterCheckBoxPreference.java index 0e3d8f9f233..48e09c9a6cc 100644 --- a/src/com/android/settings/widget/MasterCheckBoxPreference.java +++ b/src/com/android/settings/widget/MasterCheckBoxPreference.java @@ -22,11 +22,11 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.CheckBox; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.TwoTargetPreference; -import androidx.preference.PreferenceViewHolder; - /** * A custom preference that provides inline checkbox. It has a mandatory field for title, and * optional fields for icon and sub-text. diff --git a/src/com/android/settings/widget/MasterSwitchController.java b/src/com/android/settings/widget/MasterSwitchController.java index a00929259f7..91595848bdc 100644 --- a/src/com/android/settings/widget/MasterSwitchController.java +++ b/src/com/android/settings/widget/MasterSwitchController.java @@ -16,10 +16,10 @@ package com.android.settings.widget; -import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - import androidx.preference.Preference; +import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + /* * The switch controller that is used to update the switch widget in the MasterSwitchPreference * layout. diff --git a/src/com/android/settings/widget/MasterSwitchPreference.java b/src/com/android/settings/widget/MasterSwitchPreference.java index d4197db6bb8..42529cfd4d0 100644 --- a/src/com/android/settings/widget/MasterSwitchPreference.java +++ b/src/com/android/settings/widget/MasterSwitchPreference.java @@ -22,12 +22,12 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.Switch; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.TwoTargetPreference; -import androidx.preference.PreferenceViewHolder; - /** * A custom preference that provides inline switch toggle. It has a mandatory field for title, and * optional fields for icon and sub-text. diff --git a/src/com/android/settings/widget/RadioButtonPickerFragment.java b/src/com/android/settings/widget/RadioButtonPickerFragment.java index 7735bb421ee..89df487200e 100644 --- a/src/com/android/settings/widget/RadioButtonPickerFragment.java +++ b/src/com/android/settings/widget/RadioButtonPickerFragment.java @@ -26,6 +26,11 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.LayoutRes; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.InstrumentedPreferenceFragment; @@ -34,11 +39,6 @@ import com.android.settingslib.widget.CandidateInfo; import java.util.List; import java.util.Map; -import androidx.annotation.LayoutRes; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public abstract class RadioButtonPickerFragment extends InstrumentedPreferenceFragment implements RadioButtonPreference.OnClickListener { diff --git a/src/com/android/settings/widget/RadioButtonPreference.java b/src/com/android/settings/widget/RadioButtonPreference.java index 8ebbb8af9a5..ed7f9053121 100644 --- a/src/com/android/settings/widget/RadioButtonPreference.java +++ b/src/com/android/settings/widget/RadioButtonPreference.java @@ -22,12 +22,12 @@ import android.util.AttributeSet; import android.view.View; import android.widget.TextView; -import com.android.settings.R; - import androidx.core.content.res.TypedArrayUtils; import androidx.preference.CheckBoxPreference; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; + /** * Check box preference with check box replaced by radio button. * diff --git a/src/com/android/settings/widget/RestrictedAppPreference.java b/src/com/android/settings/widget/RestrictedAppPreference.java index 72625e0873c..e33c34287da 100644 --- a/src/com/android/settings/widget/RestrictedAppPreference.java +++ b/src/com/android/settings/widget/RestrictedAppPreference.java @@ -22,13 +22,13 @@ import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreferenceHelper; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceViewHolder; - /** * {@link AppPreference} that implements user restriction utilities using * {@link com.android.settingslib.RestrictedPreferenceHelper}. diff --git a/src/com/android/settings/widget/RtlCompatibleViewPager.java b/src/com/android/settings/widget/RtlCompatibleViewPager.java index be405864ac6..68caaa78ea5 100644 --- a/src/com/android/settings/widget/RtlCompatibleViewPager.java +++ b/src/com/android/settings/widget/RtlCompatibleViewPager.java @@ -23,10 +23,10 @@ import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; -import java.util.Locale; - import androidx.viewpager.widget.ViewPager; +import java.util.Locale; + /** * A {@link ViewPager} that's aware of RTL changes when used with FragmentPagerAdapter. */ diff --git a/src/com/android/settings/widget/SeekBarPreference.java b/src/com/android/settings/widget/SeekBarPreference.java index da251fa7bfd..2c57bb31a94 100644 --- a/src/com/android/settings/widget/SeekBarPreference.java +++ b/src/com/android/settings/widget/SeekBarPreference.java @@ -28,11 +28,11 @@ import android.view.accessibility.AccessibilityNodeInfo; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; -import com.android.settingslib.RestrictedPreference; - import androidx.core.content.res.TypedArrayUtils; import androidx.preference.PreferenceViewHolder; +import com.android.settingslib.RestrictedPreference; + /** * Based on android.preference.SeekBarPreference, but uses support preference as base. */ diff --git a/src/com/android/settings/widget/SingleTargetGearPreference.java b/src/com/android/settings/widget/SingleTargetGearPreference.java index b770b6dd31e..48876fa81d9 100644 --- a/src/com/android/settings/widget/SingleTargetGearPreference.java +++ b/src/com/android/settings/widget/SingleTargetGearPreference.java @@ -19,11 +19,11 @@ package com.android.settings.widget; import android.content.Context; import android.util.AttributeSet; -import com.android.settings.R; - import androidx.core.content.res.TypedArrayUtils; import androidx.preference.Preference; +import com.android.settings.R; + /** * A preference with single target and a gear icon on the side. */ diff --git a/src/com/android/settings/widget/SlidingTabLayout.java b/src/com/android/settings/widget/SlidingTabLayout.java index f8adde8d2f3..3ae4e3cc6c7 100644 --- a/src/com/android/settings/widget/SlidingTabLayout.java +++ b/src/com/android/settings/widget/SlidingTabLayout.java @@ -25,10 +25,10 @@ import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.settings.R; - import androidx.viewpager.widget.PagerAdapter; +import com.android.settings.R; + /** * To be used with ViewPager to provide a tab indicator component which give constant feedback as * to the user's scroll progress. diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java index 3450648ecc5..52a3288dc59 100644 --- a/src/com/android/settings/widget/SwitchBar.java +++ b/src/com/android/settings/widget/SwitchBar.java @@ -36,6 +36,10 @@ import android.widget.LinearLayout; import android.widget.Switch; import android.widget.TextView; +import androidx.annotation.ColorInt; +import androidx.annotation.StringRes; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.RestrictedLockUtils; @@ -44,10 +48,6 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import java.util.ArrayList; import java.util.List; -import androidx.annotation.ColorInt; -import androidx.annotation.StringRes; -import androidx.annotation.VisibleForTesting; - public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedChangeListener { public interface OnSwitchChangeListener { diff --git a/src/com/android/settings/widget/TwoStateButtonPreference.java b/src/com/android/settings/widget/TwoStateButtonPreference.java index ae3e4956b0b..b154fb4193c 100644 --- a/src/com/android/settings/widget/TwoStateButtonPreference.java +++ b/src/com/android/settings/widget/TwoStateButtonPreference.java @@ -22,12 +22,12 @@ import android.util.AttributeSet; import android.view.View; import android.widget.Button; -import com.android.settings.R; -import com.android.settings.applications.LayoutPreference; - import androidx.annotation.VisibleForTesting; import androidx.core.content.res.TypedArrayUtils; +import com.android.settings.R; +import com.android.settings.applications.LayoutPreference; + /** * Preference that presents a button with two states(On vs Off) */ diff --git a/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java b/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java index 4d541928687..998434e4326 100644 --- a/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java +++ b/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java @@ -19,15 +19,15 @@ import android.content.res.TypedArray; import android.os.Bundle; import android.widget.ArrayAdapter; -import com.android.settingslib.core.instrumentation.Instrumentable; - -import java.util.ArrayList; - import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog.Builder; import androidx.preference.ListPreference; import androidx.preference.PreferenceDialogFragmentCompat; +import com.android.settingslib.core.instrumentation.Instrumentable; + +import java.util.ArrayList; + /** * {@link PreferenceDialogFragmentCompat} that updates the available options * when {@code onListPreferenceUpdated} is called." diff --git a/src/com/android/settings/widget/UsageGraph.java b/src/com/android/settings/widget/UsageGraph.java index e56fd435488..7cef66f79d2 100644 --- a/src/com/android/settings/widget/UsageGraph.java +++ b/src/com/android/settings/widget/UsageGraph.java @@ -35,11 +35,11 @@ import android.util.SparseIntArray; import android.util.TypedValue; import android.view.View; +import androidx.annotation.VisibleForTesting; + import com.android.settings.fuelgauge.BatteryUtils; import com.android.settingslib.R; -import androidx.annotation.VisibleForTesting; - public class UsageGraph extends View { private static final int PATH_DELIM = -1; diff --git a/src/com/android/settings/widget/ValidatedEditTextPreference.java b/src/com/android/settings/widget/ValidatedEditTextPreference.java index 3204ab3894a..cc344ac67f1 100644 --- a/src/com/android/settings/widget/ValidatedEditTextPreference.java +++ b/src/com/android/settings/widget/ValidatedEditTextPreference.java @@ -26,12 +26,12 @@ import android.view.View; import android.widget.EditText; import android.widget.TextView; -import com.android.settingslib.CustomEditTextPreferenceCompat; - import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; import androidx.preference.PreferenceViewHolder; +import com.android.settingslib.CustomEditTextPreferenceCompat; + /** * {@code EditTextPreference} that supports input validation. */ diff --git a/src/com/android/settings/widget/VideoPreference.java b/src/com/android/settings/widget/VideoPreference.java index ad08ebe49e4..d5d4f5e6f4e 100644 --- a/src/com/android/settings/widget/VideoPreference.java +++ b/src/com/android/settings/widget/VideoPreference.java @@ -29,12 +29,12 @@ import android.view.TextureView; import android.view.View; import android.widget.ImageView; -import com.android.settings.R; - import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; + /** * A full width preference that hosts a MP4 video. */ diff --git a/src/com/android/settings/widget/VideoPreferenceController.java b/src/com/android/settings/widget/VideoPreferenceController.java index 457c6dfba22..a7bb754b5fd 100644 --- a/src/com/android/settings/widget/VideoPreferenceController.java +++ b/src/com/android/settings/widget/VideoPreferenceController.java @@ -18,13 +18,13 @@ package com.android.settings.widget; import android.content.Context; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.preference.PreferenceScreen; - public class VideoPreferenceController extends BasePreferenceController implements LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/widget/WorkOnlyCategory.java b/src/com/android/settings/widget/WorkOnlyCategory.java index 87d0684da94..063b105dfb2 100644 --- a/src/com/android/settings/widget/WorkOnlyCategory.java +++ b/src/com/android/settings/widget/WorkOnlyCategory.java @@ -18,11 +18,11 @@ import android.content.Context; import android.os.UserManager; import android.util.AttributeSet; +import androidx.preference.PreferenceCategory; + import com.android.settings.SelfAvailablePreference; import com.android.settings.Utils; -import androidx.preference.PreferenceCategory; - /** * A PreferenceCategory that is only visible when the device has a work profile. */ diff --git a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java index aed5e10cda7..a883826801f 100644 --- a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java +++ b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java @@ -20,12 +20,12 @@ import android.content.Context; import android.provider.Settings; import android.text.TextUtils; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.core.AbstractPreferenceController; + /** * {@link AbstractPreferenceController} that controls whether we should fall back to celluar when * wifi is bad. diff --git a/src/com/android/settings/wifi/ChangeWifiStateDetails.java b/src/com/android/settings/wifi/ChangeWifiStateDetails.java index 899b35db363..63d1745ac1f 100644 --- a/src/com/android/settings/wifi/ChangeWifiStateDetails.java +++ b/src/com/android/settings/wifi/ChangeWifiStateDetails.java @@ -20,6 +20,11 @@ import android.app.AppOpsManager; import android.content.Context; import android.os.Bundle; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; @@ -28,11 +33,6 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settings.wifi.AppStateChangeWifiStateBridge.WifiSettingsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; -import androidx.appcompat.app.AlertDialog; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.SwitchPreference; - public class ChangeWifiStateDetails extends AppInfoWithHeader implements OnPreferenceChangeListener { diff --git a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java index bbb76c784b8..3efbbff7f3b 100644 --- a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java +++ b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java @@ -19,13 +19,13 @@ package com.android.settings.wifi; import android.content.Context; import android.view.View; +import androidx.annotation.DrawableRes; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.wifi.AccessPoint; import com.android.settingslib.wifi.AccessPointPreference; -import androidx.annotation.DrawableRes; -import androidx.preference.PreferenceViewHolder; - /** * An AP preference for the currently connected AP */ diff --git a/src/com/android/settings/wifi/LongPressAccessPointPreference.java b/src/com/android/settings/wifi/LongPressAccessPointPreference.java index 85fd800d912..c3c08f0c408 100644 --- a/src/com/android/settings/wifi/LongPressAccessPointPreference.java +++ b/src/com/android/settings/wifi/LongPressAccessPointPreference.java @@ -17,12 +17,12 @@ package com.android.settings.wifi; import android.content.Context; -import com.android.settingslib.wifi.AccessPoint; -import com.android.settingslib.wifi.AccessPointPreference; - import androidx.fragment.app.Fragment; import androidx.preference.PreferenceViewHolder; +import com.android.settingslib.wifi.AccessPoint; +import com.android.settingslib.wifi.AccessPointPreference; + public class LongPressAccessPointPreference extends AccessPointPreference { private final Fragment mFragment; diff --git a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java index e5f2912fa0f..a46a82873a5 100644 --- a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java +++ b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java @@ -24,6 +24,10 @@ import android.os.Handler; import android.provider.Settings; import android.text.TextUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -31,10 +35,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - /** * {@link AbstractPreferenceController} that controls whether we should notify user when open * network is available. diff --git a/src/com/android/settings/wifi/RequestToggleWiFiActivity.java b/src/com/android/settings/wifi/RequestToggleWiFiActivity.java index a99697a5971..879a93e3288 100644 --- a/src/com/android/settings/wifi/RequestToggleWiFiActivity.java +++ b/src/com/android/settings/wifi/RequestToggleWiFiActivity.java @@ -31,11 +31,11 @@ import android.text.TextUtils; import android.util.Log; import android.widget.Toast; +import androidx.annotation.NonNull; + import com.android.internal.app.AlertActivity; import com.android.settings.R; -import androidx.annotation.NonNull; - /** * This activity handles requests to toggle WiFi by collecting user * consent and waiting until the state change is completed. diff --git a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java index df24c42140f..eef22167bb2 100644 --- a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java +++ b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java @@ -14,6 +14,11 @@ import android.os.Looper; import android.provider.Settings; import android.text.TextUtils; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -24,11 +29,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.List; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - /** * {@link AbstractPreferenceController} that controls whether a user wants to enable the "use open * networks automatically" feature provider by the current network recommendation provider. diff --git a/src/com/android/settings/wifi/WifiAPITest.java b/src/com/android/settings/wifi/WifiAPITest.java index 52a54b7ae55..c0b90f9fe5a 100644 --- a/src/com/android/settings/wifi/WifiAPITest.java +++ b/src/com/android/settings/wifi/WifiAPITest.java @@ -24,14 +24,14 @@ import android.os.Bundle; import android.text.Editable; import android.widget.EditText; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.R; -import com.android.settings.SettingsPreferenceFragment; - import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settings.R; +import com.android.settings.SettingsPreferenceFragment; + /** * Provide an interface for testing out the Wifi API diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 789c433d9b9..de67c10baac 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -57,6 +57,8 @@ import android.widget.ScrollView; import android.widget.Spinner; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.android.settings.ProxySelector; import com.android.settings.R; import com.android.settingslib.Utils; @@ -69,8 +71,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; -import androidx.annotation.VisibleForTesting; - /** * The class for allowing UIs like {@link WifiDialog} and {@link WifiConfigUiBase} to * share the logic for controlling buttons, text fields, etc. diff --git a/src/com/android/settings/wifi/WifiDetailPreference.java b/src/com/android/settings/wifi/WifiDetailPreference.java index 449522a8bea..2567a429932 100644 --- a/src/com/android/settings/wifi/WifiDetailPreference.java +++ b/src/com/android/settings/wifi/WifiDetailPreference.java @@ -21,11 +21,11 @@ import android.text.TextUtils; import android.util.AttributeSet; import android.widget.TextView; -import com.android.settings.R; - import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; + /** * A Preference to be used with the Wifi Network Detail Fragment that allows a summary text to be * set inside the widget resource diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java index b53162c2759..f1df7e47630 100644 --- a/src/com/android/settings/wifi/WifiDialog.java +++ b/src/com/android/settings/wifi/WifiDialog.java @@ -22,12 +22,12 @@ import android.os.Bundle; import android.view.View; import android.widget.Button; +import androidx.appcompat.app.AlertDialog; + import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.wifi.AccessPoint; -import androidx.appcompat.app.AlertDialog; - public class WifiDialog extends AlertDialog implements WifiConfigUiBase, DialogInterface.OnClickListener { diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java index d8648557afc..63785e6902f 100644 --- a/src/com/android/settings/wifi/WifiDialogActivity.java +++ b/src/com/android/settings/wifi/WifiDialogActivity.java @@ -26,12 +26,12 @@ import android.net.wifi.WifiManager.ActionListener; import android.os.Bundle; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.SetupWizardUtils; import com.android.settingslib.wifi.AccessPoint; import com.android.setupwizardlib.util.WizardManagerHelper; -import androidx.annotation.VisibleForTesting; - public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialogListener, DialogInterface.OnDismissListener { diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java index b7696657c19..8efefc37628 100644 --- a/src/com/android/settings/wifi/WifiEnabler.java +++ b/src/com/android/settings/wifi/WifiEnabler.java @@ -30,6 +30,8 @@ import android.os.UserManager; import android.provider.Settings; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.widget.SwitchWidgetController; @@ -40,8 +42,6 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import java.util.concurrent.atomic.AtomicBoolean; -import androidx.annotation.VisibleForTesting; - public class WifiEnabler implements SwitchWidgetController.OnSwitchChangeListener { private final SwitchWidgetController mSwitchWidget; diff --git a/src/com/android/settings/wifi/WifiInfoPreferenceController.java b/src/com/android/settings/wifi/WifiInfoPreferenceController.java index d15c5086213..e8477123af8 100644 --- a/src/com/android/settings/wifi/WifiInfoPreferenceController.java +++ b/src/com/android/settings/wifi/WifiInfoPreferenceController.java @@ -25,6 +25,10 @@ import android.net.wifi.WifiManager; import android.provider.Settings; import android.text.TextUtils; +import androidx.core.text.BidiFormatter; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.PreferenceControllerMixin; @@ -34,10 +38,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.core.text.BidiFormatter; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * {@link PreferenceControllerMixin} that updates MAC/IP address. */ diff --git a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java index 6f827620bf7..692608ccbe8 100644 --- a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java +++ b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java @@ -17,6 +17,8 @@ package com.android.settings.wifi; import android.content.Context; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.widget.MasterSwitchController; @@ -30,8 +32,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import androidx.preference.PreferenceScreen; - public class WifiMasterSwitchPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, SummaryUpdater.OnSummaryChangeListener, LifecycleObserver, OnResume, OnPause, OnStart, OnStop { diff --git a/src/com/android/settings/wifi/WifiPickerActivity.java b/src/com/android/settings/wifi/WifiPickerActivity.java index f7c4f7936bd..a590a0f5c93 100644 --- a/src/com/android/settings/wifi/WifiPickerActivity.java +++ b/src/com/android/settings/wifi/WifiPickerActivity.java @@ -17,14 +17,14 @@ package com.android.settings.wifi; import android.content.Intent; +import androidx.preference.PreferenceFragmentCompat; + import com.android.settings.ButtonBarHandler; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.wifi.p2p.WifiP2pSettings; import com.android.settings.wifi.savedaccesspoints.SavedAccessPointsWifiSettings; -import androidx.preference.PreferenceFragmentCompat; - public class WifiPickerActivity extends SettingsActivity implements ButtonBarHandler { @Override diff --git a/src/com/android/settings/wifi/WifiScanModeActivity.java b/src/com/android/settings/wifi/WifiScanModeActivity.java index cdd4f5fba15..a9be6a3c2a4 100644 --- a/src/com/android/settings/wifi/WifiScanModeActivity.java +++ b/src/com/android/settings/wifi/WifiScanModeActivity.java @@ -25,14 +25,14 @@ import android.net.wifi.WifiManager; import android.os.Bundle; import android.provider.Settings; -import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.R; -import com.android.settings.core.instrumentation.InstrumentedDialogFragment; - import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentActivity; +import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.R; +import com.android.settings.core.instrumentation.InstrumentedDialogFragment; + /** * This activity requests users permission to allow scanning even when Wi-Fi is turned off */ diff --git a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java index a2e8b0eaf02..fd279cc1e69 100644 --- a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java +++ b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java @@ -28,14 +28,14 @@ import android.text.TextUtils; import android.util.Log; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settingslib.HelpUtils; -import androidx.annotation.VisibleForTesting; -import androidx.appcompat.app.AlertDialog; - public class WifiScanningRequiredFragment extends InstrumentedDialogFragment implements DialogInterface.OnClickListener { diff --git a/src/com/android/settings/wifi/WifiSlice.java b/src/com/android/settings/wifi/WifiSlice.java index 67fd2f99e72..d0b14e383c7 100644 --- a/src/com/android/settings/wifi/WifiSlice.java +++ b/src/com/android/settings/wifi/WifiSlice.java @@ -32,20 +32,19 @@ import android.net.wifi.WifiSsid; import android.provider.SettingsSlicesContract; import android.text.TextUtils; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.R; -import com.android.settings.SubSettings; -import com.android.settings.Utils; -import com.android.settings.slices.CustomSliceable; -import com.android.settings.slices.SliceBroadcastReceiver; -import com.android.settings.slices.SliceBuilderUtils; - import androidx.core.graphics.drawable.IconCompat; import androidx.slice.Slice; import androidx.slice.builders.ListBuilder; import androidx.slice.builders.ListBuilder.RowBuilder; import androidx.slice.builders.SliceAction; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settings.R; +import com.android.settings.SubSettings; +import com.android.settings.Utils; +import com.android.settings.slices.CustomSliceable; +import com.android.settings.slices.SliceBuilderUtils; + /** * Utility class to build a Wifi Slice, and handle all associated actions. */ diff --git a/src/com/android/settings/wifi/WifiSummaryUpdater.java b/src/com/android/settings/wifi/WifiSummaryUpdater.java index f22b1b6db0d..86961132c42 100644 --- a/src/com/android/settings/wifi/WifiSummaryUpdater.java +++ b/src/com/android/settings/wifi/WifiSummaryUpdater.java @@ -26,12 +26,12 @@ import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.widget.SummaryUpdater; import com.android.settingslib.wifi.WifiStatusTracker; -import androidx.annotation.VisibleForTesting; - /** * Helper class that listeners to wifi callback and notify client when there is update in * wifi summary info. diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java index 6379caf5492..bf9d1679c74 100644 --- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java +++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java @@ -25,18 +25,18 @@ import android.location.LocationManager; import android.provider.Settings; import android.text.TextUtils; -import com.android.settings.R; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.utils.AnnotationSpan; -import com.android.settingslib.core.AbstractPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import com.android.settings.R; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settings.dashboard.DashboardFragment; +import com.android.settings.utils.AnnotationSpan; +import com.android.settingslib.core.AbstractPreferenceController; + /** * {@link PreferenceControllerMixin} that controls whether the Wi-Fi Wakeup feature should be * enabled. diff --git a/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java b/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java index 55ad18301ab..b56eca60307 100644 --- a/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java +++ b/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java @@ -40,13 +40,13 @@ import android.widget.CompoundButton; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; + import com.android.settings.R; import com.android.settingslib.wifi.AccessPoint; import java.io.IOException; -import androidx.appcompat.app.AlertDialog; - class WriteWifiConfigToNfcDialog extends AlertDialog implements TextWatcher, View.OnClickListener, CompoundButton.OnCheckedChangeListener { diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettings.java b/src/com/android/settings/wifi/calling/WifiCallingSettings.java index 5762b7be273..ac84783923c 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSettings.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSettings.java @@ -24,6 +24,10 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; + import com.android.ims.ImsManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -36,10 +40,6 @@ import com.android.settings.widget.SlidingTabLayout; import java.util.List; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentPagerAdapter; - /** * "Wi-Fi Calling settings" screen. This is the container fragment which holds * {@link WifiCallingSettingsForSub} fragments. diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java index 6d340296363..6b368c5a4bf 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java @@ -36,6 +36,12 @@ import android.view.ViewGroup; import android.widget.Switch; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceScreen; + import com.android.ims.ImsConfig; import com.android.ims.ImsManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -46,12 +52,6 @@ import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; import com.android.settings.widget.SwitchBar; -import androidx.appcompat.app.AlertDialog; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceScreen; - /** * This is the inner class of {@link WifiCallingSettings} fragment. * The preference screen lets you enable/disable Wi-Fi Calling and change Wi-Fi Calling mode. diff --git a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java index baf2a977267..0629ad34bb2 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java @@ -31,6 +31,13 @@ import android.telephony.SubscriptionManager; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.builders.ListBuilder; +import androidx.slice.builders.ListBuilder.RowBuilder; +import androidx.slice.builders.SliceAction; + import com.android.ims.ImsConfig; import com.android.ims.ImsManager; import com.android.settings.R; @@ -47,13 +54,6 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import androidx.annotation.VisibleForTesting; -import androidx.core.graphics.drawable.IconCompat; -import androidx.slice.Slice; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.ListBuilder.RowBuilder; -import androidx.slice.builders.SliceAction; - /** * Helper class to control slices for wifi calling settings. diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java index bda3b767cf3..46f485c9ba5 100644 --- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java @@ -44,6 +44,13 @@ import android.util.Log; import android.widget.ImageView; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; +import androidx.core.text.BidiFormatter; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; @@ -70,13 +77,6 @@ import java.net.UnknownHostException; import java.util.StringJoiner; import java.util.stream.Collectors; -import androidx.annotation.VisibleForTesting; -import androidx.core.text.BidiFormatter; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - /** * Controller for logic pertaining to displaying Wifi information for the * {@link WifiNetworkDetailsFragment}. diff --git a/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java b/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java index 6558019d3e6..341b2279994 100644 --- a/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java @@ -21,13 +21,13 @@ import android.content.Context; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; -import com.android.settings.core.BasePreferenceController; -import com.android.settingslib.core.AbstractPreferenceController; - import androidx.annotation.VisibleForTesting; import androidx.preference.DropDownPreference; import androidx.preference.Preference; +import com.android.settings.core.BasePreferenceController; +import com.android.settingslib.core.AbstractPreferenceController; + /** * {@link AbstractPreferenceController} that controls whether the wifi network is metered or not */ diff --git a/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java b/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java index 48e4124ce71..ac8113bcc5b 100644 --- a/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java +++ b/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java @@ -18,13 +18,13 @@ package com.android.settings.wifi.p2p; import android.content.Context; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; - import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.core.AbstractPreferenceController; + public abstract class P2pCategoryPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java b/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java index 3a2b9f5ecd6..ade423a486a 100644 --- a/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java +++ b/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java @@ -20,12 +20,12 @@ import android.content.Context; import android.net.wifi.p2p.WifiP2pDevice; import android.text.TextUtils; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.core.AbstractPreferenceController; + public class P2pThisDevicePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java index d2d65c3135f..6caef94c6fa 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java @@ -22,11 +22,11 @@ import android.net.wifi.p2p.WifiP2pDevice; import android.text.TextUtils; import android.widget.ImageView; -import com.android.settings.R; - import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; + public class WifiP2pPeer extends Preference { private static final int[] STATE_SECURED = {R.attr.state_encrypted}; diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java index 3a7b670625a..4f3b7fd63b3 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java @@ -21,6 +21,10 @@ import android.content.Intent; import android.content.IntentFilter; import android.net.wifi.WifiManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -28,10 +32,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * {@link PreferenceControllerMixin} to toggle Wifi Direct preference on Wi-Fi state. */ diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java index 641c3c35b7e..bfdcb215dbc 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java @@ -46,6 +46,10 @@ import android.view.MenuItem; import android.widget.EditText; import android.widget.Toast; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; @@ -54,10 +58,6 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.ArrayList; import java.util.List; -import androidx.appcompat.app.AlertDialog; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /* * Displays Wi-fi p2p settings UI */ diff --git a/src/com/android/settings/wifi/tether/TetherService.java b/src/com/android/settings/wifi/tether/TetherService.java index 3cfa7a1cba9..4b39f676df3 100644 --- a/src/com/android/settings/wifi/tether/TetherService.java +++ b/src/com/android/settings/wifi/tether/TetherService.java @@ -40,11 +40,11 @@ import android.text.TextUtils; import android.util.ArrayMap; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; - public class TetherService extends Service { private static final String TAG = "TetherService"; private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); diff --git a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java index 02b5c51af51..3a85f7be4fe 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java @@ -21,12 +21,12 @@ import android.content.res.Resources; import android.net.wifi.WifiConfiguration; import android.util.Log; -import com.android.settings.R; - import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; +import com.android.settings.R; + public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferenceController { private static final String TAG = "WifiTetherApBandPref"; diff --git a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java index d0c2270ad39..01a0b5707cb 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java @@ -19,11 +19,11 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.BasePreferenceController; - import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.core.BasePreferenceController; + public class WifiTetherAutoOffPreferenceController extends BasePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java index 59fd989188c..94e9209defb 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java @@ -20,12 +20,12 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiManager; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; - import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.core.AbstractPreferenceController; + public abstract class WifiTetherBasePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java index bbba316142f..8d9e8586f44 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java @@ -20,15 +20,15 @@ import android.content.Context; import android.net.wifi.WifiConfiguration; import android.text.TextUtils; +import androidx.preference.EditTextPreference; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.widget.ValidatedEditTextPreference; import com.android.settings.wifi.WifiUtils; import java.util.UUID; -import androidx.preference.EditTextPreference; -import androidx.preference.Preference; - public class WifiTetherPasswordPreferenceController extends WifiTetherBasePreferenceController implements ValidatedEditTextPreference.Validator { diff --git a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java index a8b2dbf7c70..2ae6b586ae6 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java @@ -26,6 +26,10 @@ import android.net.wifi.WifiManager; import android.provider.Settings; import android.text.BidiFormatter; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.PreferenceControllerMixin; @@ -35,10 +39,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - public class WifiTetherPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop { diff --git a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java index 5044281f36d..fb2ce97db6b 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java @@ -20,12 +20,12 @@ import android.content.Context; import android.net.wifi.WifiConfiguration; import android.util.Log; -import com.android.settings.widget.ValidatedEditTextPreference; - import androidx.annotation.VisibleForTesting; import androidx.preference.EditTextPreference; import androidx.preference.Preference; +import com.android.settings.widget.ValidatedEditTextPreference; + public class WifiTetherSSIDPreferenceController extends WifiTetherBasePreferenceController implements ValidatedEditTextPreference.Validator { diff --git a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java index 055ce9604ef..f97a20911eb 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java @@ -3,11 +3,11 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.net.wifi.WifiConfiguration; -import com.android.settings.R; - import androidx.preference.ListPreference; import androidx.preference.Preference; +import com.android.settings.R; + public class WifiTetherSecurityPreferenceController extends WifiTetherBasePreferenceController { private static final String PREF_KEY = "wifi_tether_security"; diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java index 47f3ceda391..647ba5a838b 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java @@ -30,6 +30,8 @@ import android.os.UserManager; import android.provider.SearchIndexableResource; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -45,8 +47,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import androidx.annotation.VisibleForTesting; - @SearchIndexable public class WifiTetherSettings extends RestrictedDashboardFragment implements WifiTetherBasePreferenceController.OnTetherConfigUpdateListener { diff --git a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java index 594eec73184..8d87b3284b2 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java @@ -28,14 +28,14 @@ import android.os.Handler; import android.os.Looper; import android.provider.Settings; +import androidx.annotation.VisibleForTesting; + import com.android.settings.datausage.DataSaverBackend; import com.android.settings.widget.SwitchWidgetController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import androidx.annotation.VisibleForTesting; - public class WifiTetherSwitchBarController implements SwitchWidgetController.OnSwitchChangeListener, LifecycleObserver, OnStart, OnStop, DataSaverBackend.Listener { diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MasterClearTest.java index c7f366e8617..b1cd71446c8 100644 --- a/tests/robotests/src/com/android/settings/MasterClearTest.java +++ b/tests/robotests/src/com/android/settings/MasterClearTest.java @@ -17,6 +17,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doNothing; @@ -48,6 +49,8 @@ import android.widget.CheckBox; import android.widget.LinearLayout; import android.widget.ScrollView; +import androidx.fragment.app.FragmentActivity; + import com.android.settings.testutils.Robolectric; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; @@ -62,8 +65,6 @@ import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowActivity; -import androidx.fragment.app.FragmentActivity; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowUtils.class) public class MasterClearTest { diff --git a/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java b/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java index 8753b1d3900..a10a4a41b10 100644 --- a/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java +++ b/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java @@ -17,6 +17,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.app.Activity; diff --git a/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java b/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java index e4e97104f60..d66cd8f777b 100644 --- a/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java @@ -16,6 +16,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java index 73be1078b14..761b3f1e6ad 100644 --- a/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java @@ -22,6 +22,8 @@ import static org.mockito.Mockito.verify; import android.app.Activity; +import androidx.appcompat.app.AlertDialog; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -30,8 +32,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.appcompat.app.AlertDialog; - @RunWith(SettingsRobolectricTestRunner.class) public class RestrictedSettingsFragmentTest { diff --git a/tests/robotests/src/com/android/settings/SettingsActivityTest.java b/tests/robotests/src/com/android/settings/SettingsActivityTest.java index 3d529e45d77..723978f9bb1 100644 --- a/tests/robotests/src/com/android/settings/SettingsActivityTest.java +++ b/tests/robotests/src/com/android/settings/SettingsActivityTest.java @@ -17,6 +17,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -30,6 +31,11 @@ import android.content.Intent; import android.os.Bundle; import android.provider.Settings.Global; import android.view.View; + +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; + import com.android.settings.core.OnActivityResultListener; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -44,10 +50,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; - @RunWith(SettingsRobolectricTestRunner.class) public class SettingsActivityTest { diff --git a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java index f9409f4b5cd..c78a44a78f4 100644 --- a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java @@ -22,6 +22,8 @@ import static org.mockito.Mockito.when; import android.app.Dialog; +import androidx.fragment.app.Fragment; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -31,8 +33,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.fragment.app.Fragment; - @RunWith(SettingsRobolectricTestRunner.class) public class SettingsDialogFragmentTest { diff --git a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java index 25380807b78..6015e2789e8 100644 --- a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java +++ b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java @@ -16,6 +16,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; @@ -28,6 +29,8 @@ import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import androidx.annotation.NonNull; + import com.android.settings.fuelgauge.batterytip.AnomalyConfigJobService; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -43,8 +46,6 @@ import org.robolectric.RuntimeEnvironment; import java.io.OutputStream; import java.io.PrintWriter; -import androidx.annotation.NonNull; - @RunWith(SettingsRobolectricTestRunner.class) public class SettingsDumpServiceTest { diff --git a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java index 281a6c9b9e7..89893173759 100644 --- a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java +++ b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java @@ -17,6 +17,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java index 1316545516e..68487931262 100644 --- a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java @@ -17,17 +17,23 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.Activity; import android.content.Context; import android.os.Bundle; import android.view.View; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; @@ -41,12 +47,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class SettingsPreferenceFragmentTest { diff --git a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java index f2bd79c4c6d..83a727258fe 100644 --- a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java +++ b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java @@ -17,6 +17,7 @@ package com.android.settings; import static com.android.settings.testutils.ResIdSubject.assertResId; + import static com.google.common.truth.Truth.assertThat; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java index 36736ce1e63..3cb9c4c3da0 100644 --- a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java @@ -23,6 +23,8 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; @@ -32,8 +34,6 @@ import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResourcesImpl.class) public class SummaryPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/TetherSettingsTest.java b/tests/robotests/src/com/android/settings/TetherSettingsTest.java index 7ccb219c434..269e52de690 100644 --- a/tests/robotests/src/com/android/settings/TetherSettingsTest.java +++ b/tests/robotests/src/com/android/settings/TetherSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/UtilsTest.java b/tests/robotests/src/com/android/settings/UtilsTest.java index 92aedcfe6a6..5f2abba37ef 100644 --- a/tests/robotests/src/com/android/settings/UtilsTest.java +++ b/tests/robotests/src/com/android/settings/UtilsTest.java @@ -17,6 +17,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java index 9fdcef58778..cdd08384823 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java @@ -39,8 +39,8 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.ShadowBluetoothUtils; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; +import com.android.settings.testutils.shadow.ShadowBluetoothUtils; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.HearingAidProfile; diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java index db038332a30..cb2aa8b1914 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.accessibility; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -25,6 +26,8 @@ import android.content.Context; import android.os.Vibrator; import android.provider.Settings; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; @@ -37,8 +40,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class AccessibilitySettingsTest { diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java index afdeed4e2d8..b00d64d8eb5 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.accessibility; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; import android.accessibilityservice.AccessibilityServiceInfo; diff --git a/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java index ef67f656678..6fb6f0e8d4e 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java @@ -18,11 +18,14 @@ package com.android.settings.accessibility; import static com.android.settings.accessibility.ColorInversionPreferenceController.OFF; import static com.android.settings.accessibility.ColorInversionPreferenceController.ON; + import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; +import androidx.preference.SwitchPreference; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -32,8 +35,6 @@ import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class ColorInversionPreferenceControllerTest { private static final int UNKNOWN = -1; diff --git a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java index 30cf139798d..96b03236245 100644 --- a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java @@ -20,6 +20,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -30,8 +32,6 @@ import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.lifecycle.LifecycleOwner; - @RunWith(SettingsRobolectricTestRunner.class) public class HapticFeedbackIntensityPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java index b4b76d809e5..020906aee5c 100644 --- a/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java @@ -18,11 +18,14 @@ package com.android.settings.accessibility; import static com.android.settings.accessibility.MagnificationPreferenceFragment.OFF; import static com.android.settings.accessibility.MagnificationPreferenceFragment.ON; + import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -33,8 +36,6 @@ import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class MagnificationGesturesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java index 4362759e767..225a2bbe90a 100644 --- a/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java @@ -19,13 +19,17 @@ package com.android.settings.accessibility; import static com.android.settings.accessibility.MagnificationPreferenceFragment.OFF; import static com.android.settings.accessibility.MagnificationPreferenceFragment.ON; import static com.android.settings.core.BasePreferenceController.AVAILABLE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; import android.content.res.Resources; import android.provider.Settings; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -40,8 +44,6 @@ import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.annotation.Resetter; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class MagnificationNavbarPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java index f344f5a695f..3a7fd56b9c7 100644 --- a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.accessibility; import static android.provider.Settings.System.NOTIFICATION_VIBRATION_INTENSITY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -26,6 +28,10 @@ import android.content.res.Resources; import android.os.Vibrator; import android.provider.Settings; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,10 +44,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class NotificationVibrationIntensityPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java index 1fe64c7f4e1..26b3a6c8e2c 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.accessibility; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java index eb63d9c9f7f..8fc17cebec9 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java @@ -25,6 +25,8 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.XmlRes; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; @@ -35,8 +37,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.annotation.Config; -import androidx.annotation.XmlRes; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) public class ToggleFeaturePreferenceFragmentTest { diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java index 44b1bc895fe..a44b62ba0b4 100644 --- a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java @@ -21,7 +21,9 @@ import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_MEDIUM; import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_OFF; import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java index feb2b56ed47..19a140c5b0f 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.accounts; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -28,6 +30,10 @@ import android.os.Bundle; import android.os.UserHandle; import android.widget.TextView; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.FakeFeatureFactory; @@ -45,10 +51,6 @@ import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = AccountHeaderPreferenceControllerTest.ShadowAuthenticatorHelper.class) public class AccountHeaderPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java index e7902182095..5ab0982de1c 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -39,6 +40,11 @@ import android.os.UserHandle; import android.os.UserManager; import android.text.TextUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.AccessiblePreferenceCategory; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -63,11 +69,6 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public class AccountPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java index bd793606023..672baaab576 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; @@ -28,6 +29,8 @@ import android.content.Intent; import android.content.SyncAdapterType; import android.os.UserHandle; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -44,8 +47,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public class AccountSyncPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accounts/AccountSyncSettingsTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncSettingsTest.java index ea646e34a43..7171a6b20b3 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountSyncSettingsTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountSyncSettingsTest.java @@ -23,6 +23,8 @@ import android.accounts.Account; import android.content.Context; import android.os.UserHandle; +import androidx.fragment.app.FragmentActivity; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowContentResolver; @@ -33,8 +35,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -import androidx.fragment.app.FragmentActivity; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowContentResolver.class}) public class AccountSyncSettingsTest { diff --git a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java index f5a012726ca..c944c30344f 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java @@ -30,6 +30,12 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.UserHandle; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragmentCompat; +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; import com.android.settings.testutils.shadow.ShadowContentResolver; @@ -44,12 +50,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -import androidx.preference.Preference; -import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class AccountTypePreferenceLoaderTest { diff --git a/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java index a8227ec4083..2fa233cab93 100644 --- a/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -30,6 +31,11 @@ import android.content.SyncAdapterType; import android.graphics.drawable.ColorDrawable; import android.os.UserHandle; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -46,11 +52,6 @@ import org.robolectric.Robolectric; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.Preference; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class, ShadowRestrictedLockUtils.class}) diff --git a/tests/robotests/src/com/android/settings/accounts/ContactSearchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/ContactSearchPreferenceControllerTest.java index ebd3beb3195..21b93026cb5 100644 --- a/tests/robotests/src/com/android/settings/accounts/ContactSearchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/ContactSearchPreferenceControllerTest.java @@ -16,7 +16,9 @@ package com.android.settings.accounts; import static android.provider.Settings.Secure.MANAGED_PROFILE_CONTACT_REMOTE_SEARCH; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java index f5e415bd5c3..623a76efff2 100644 --- a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -30,6 +31,9 @@ import android.content.pm.ResolveInfo; import android.content.pm.UserInfo; import android.os.UserManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.search.SearchIndexableRaw; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -48,9 +52,6 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class EmergencyInfoPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java index 3147625adb4..6b806259047 100644 --- a/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java @@ -17,11 +17,15 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.widget.FooterPreferenceMixinCompat; @@ -32,9 +36,6 @@ import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class EnterpriseDisclosurePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java index ce1dcb2712b..0803d78d0f2 100644 --- a/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.accounts; import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM; + import static com.google.common.truth.Truth.assertThat; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java index decac8acf19..de67bd2b059 100644 --- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java @@ -38,6 +38,13 @@ import android.os.UserHandle; import android.os.UserManager; import android.widget.Button; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -58,13 +65,6 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -import androidx.fragment.app.FragmentActivity; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; -import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { ShadowUserManager.class, diff --git a/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java index f9ac3a64c28..1223d5590c0 100644 --- a/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.spy; @@ -26,6 +27,8 @@ import android.content.Context; import android.os.UserHandle; import android.os.UserManager; +import androidx.preference.SwitchPreference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,8 +39,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class WorkModePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java index 0d905aa5bb6..ddcbf85e49f 100644 --- a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -31,6 +32,10 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.UserHandle; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -51,10 +56,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -import androidx.appcompat.app.AlertDialog; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowEntityHeaderController.class) public class AppInfoWithHeaderTest { diff --git a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java index 5bebe5a395c..cb3d3ad7e18 100644 --- a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -32,6 +33,8 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PermissionGroupInfo; import android.content.pm.PermissionInfo; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -44,8 +47,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class AppPermissionsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java index 327a49962eb..8e3bb4254a0 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static android.text.format.DateUtils.DAY_IN_MILLIS; + import static com.android.settings.applications.AppStateNotificationBridge .FILTER_APP_NOTIFICATION_FREQUENCY; import static com.android.settings.applications.AppStateNotificationBridge @@ -25,9 +26,12 @@ import static com.android.settings.applications.AppStateNotificationBridge .FREQUENCY_NOTIFICATION_COMPARATOR; import static com.android.settings.applications.AppStateNotificationBridge .RECENT_NOTIFICATION_COMPARATOR; + import static com.google.common.truth.Truth.assertThat; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; diff --git a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java index a465ff30122..04a1237150a 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java @@ -1,11 +1,14 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource.AppStorageStats; @@ -16,8 +19,6 @@ import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class AppStorageSizesControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java index d8c8c38ca52..43f855ddf0e 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java index 4f743711039..96836ae90a2 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java index 89cf6a065fd..ba07dc5caed 100644 --- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; diff --git a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java index dda6b72e9f2..8098e5c10a2 100644 --- a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java index 4fa30eb9219..3378492d27d 100644 --- a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java +++ b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java index aab4fb4b23b..a68a00b6cd0 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.argThat; diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java index a2eb07e90a0..3cb5a57a70b 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.argThat; diff --git a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java index f925a75f09e..da65165c1e9 100644 --- a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java @@ -17,12 +17,16 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; import android.view.LayoutInflater; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -31,9 +35,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) public class LayoutPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java index 1bee628583a..e3e45fb4dca 100644 --- a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; @@ -43,6 +44,10 @@ import android.os.UserHandle; import android.os.UserManager; import android.text.TextUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.AppUtils; @@ -63,10 +68,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class RecentAppsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java index 79ada895aec..f9cb01b9881 100644 --- a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java index d9465bd9e87..284ce06c748 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyDouble; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; @@ -32,6 +33,10 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.os.BatteryStats; import android.os.Bundle; +import androidx.loader.app.LoaderManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.SettingsActivity; @@ -50,10 +55,6 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -import androidx.loader.app.LoaderManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class AppBatteryPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java index dac9409cf7d..44ace780c82 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java @@ -42,6 +42,8 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.UserManager; +import androidx.fragment.app.Fragment; + import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.testutils.FakeFeatureFactory; @@ -63,8 +65,6 @@ import org.mockito.MockitoAnnotations; import org.mockito.stubbing.Answer; import org.robolectric.util.ReflectionHelpers; -import androidx.fragment.app.Fragment; - @RunWith(SettingsRobolectricTestRunner.class) public class AppButtonsPreferenceControllerTest { 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 ae9e429245d..74966a2a958 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -33,6 +34,9 @@ import android.net.ConnectivityManager; import android.net.INetworkStatsSession; import android.os.Bundle; +import androidx.loader.app.LoaderManager; +import androidx.preference.Preference; + import com.android.settings.core.BasePreferenceController; import com.android.settings.datausage.AppDataUsage; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -46,9 +50,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.loader.app.LoaderManager; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class AppDataUsagePreferenceControllerTest { 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 944b4b19f62..a342e10c8be 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications.appinfo; import static androidx.lifecycle.Lifecycle.Event.ON_START; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; @@ -35,6 +37,10 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; +import androidx.fragment.app.FragmentActivity; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -49,10 +55,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; import org.robolectric.RuntimeEnvironment; -import androidx.fragment.app.FragmentActivity; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class AppHeaderViewPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java index 36bdeb74182..b6bb9b57969 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java @@ -20,7 +20,9 @@ import static com.android.settings.applications.appinfo.AppInfoDashboardFragment import static com.android.settings.applications.appinfo.AppInfoDashboardFragment .UNINSTALL_ALL_USERS_MENU; import static com.android.settings.applications.appinfo.AppInfoDashboardFragment.UNINSTALL_UPDATES; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.doNothing; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java index 6796605569a..e68f8d39955 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications.appinfo; import static com.android.settings.applications.appinfo.AppInfoDashboardFragment.SUB_INFO_FRAGMENT; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -27,6 +29,9 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.os.Bundle; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.core.BasePreferenceController; @@ -42,9 +47,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class AppInfoPreferenceControllerBaseTest { 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 2e988d8f668..30152a40775 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.any; @@ -36,6 +37,8 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -46,8 +49,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class AppInstallerInfoPreferenceControllerTest { 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 77e1ecaf9a6..a32c23c343b 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -27,6 +28,9 @@ import android.content.Intent; import android.os.UserManager; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.SettingsActivity; import com.android.settings.applications.ProcStatsData; import com.android.settings.applications.ProcessStatsDetail; @@ -44,9 +48,6 @@ import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class AppMemoryPreferenceControllerTest { 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 cd335ea13b7..a3e7ca6af15 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications.appinfo; import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -29,6 +31,10 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.notification.AppNotificationSettings; import com.android.settings.notification.NotificationBackend; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -42,10 +48,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class AppNotificationPreferenceControllerTest { 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 a18a0417d38..b3d0a0dbaf9 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -28,6 +29,9 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.applications.AppLaunchSettings; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.AppUtils; @@ -42,9 +46,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class AppOpenByDefaultPreferenceControllerTest { 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 99bfe327528..de95a1c2ded 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java @@ -23,6 +23,8 @@ import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.ResolveInfo; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -34,8 +36,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPackageManager; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class AppSettingPreferenceControllerTest { 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 3cb48b67f9a..0cf8b081a6a 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -28,6 +29,9 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.os.Bundle; +import androidx.loader.app.LoaderManager; +import androidx.preference.Preference; + import com.android.settings.applications.AppStorageSettings; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState.AppEntry; @@ -40,9 +44,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.loader.app.LoaderManager; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class AppStoragePreferenceControllerTest { 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 0b7ad048f8d..e07f66e9762 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java @@ -23,6 +23,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageInfo; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -32,8 +34,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class AppVersionPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java index 80a696abb33..abce50aa175 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java @@ -16,6 +16,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -24,6 +25,9 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.content.DialogInterface; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; @@ -38,9 +42,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class}) public class ButtonActionDialogFragmentTest { 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 794d5e599b3..f41ccf89603 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,6 +26,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.applications.DefaultAppSettings; @@ -37,9 +41,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class DefaultAppShortcutPreferenceControllerBaseTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java index 34a9e2e2fa8..f6abb5bc197 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java index 999e802b10d..e630a4c5d37 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java index 5536cff17fe..a0b802e80f1 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java index cd6a3aef625..ac79a4fba6a 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java index 35f3d618098..3b9ce3d450b 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java index 20f29bfe9e1..3cc4cfe6caa 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.applications.appinfo; import static android.Manifest.permission.SYSTEM_ALERT_WINDOW; import static android.Manifest.permission.WRITE_SETTINGS; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -28,6 +30,8 @@ import android.content.Context; import android.content.pm.PackageInfo; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,8 +42,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class DrawOverlayDetailPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java index cbc4d00efc7..d867b6faead 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java @@ -17,17 +17,19 @@ package com.android.settings.applications.appinfo; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; + import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.nullable; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.Activity; import android.content.Context; import android.view.Window; import android.view.WindowManager.LayoutParams; +import androidx.fragment.app.FragmentActivity; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -44,8 +46,6 @@ import org.mockito.Spy; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.fragment.app.FragmentActivity; - @RunWith(SettingsRobolectricTestRunner.class) public class DrawOverlayDetailsTest { 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 b857308733f..a81035f17cc 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,6 +26,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -35,8 +38,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class ExternalSourceDetailPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java index 4f8961570a6..d636fa468ef 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java index 6b4a6417bbe..29c783c1835 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java @@ -16,6 +16,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -29,6 +30,9 @@ import android.content.Context; import android.content.DialogInterface; import android.content.pm.PackageManager; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.FragmentActivity; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; @@ -41,9 +45,6 @@ import org.robolectric.Robolectric; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.FragmentActivity; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class}) public class InstantAppButtonDialogFragmentTest { 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 45fee32cf0b..5d8c8426465 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.argThat; @@ -41,6 +42,11 @@ import android.view.MenuItem; import android.view.View; import android.widget.Button; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.BasePreferenceController; @@ -56,11 +62,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class InstantAppButtonsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java index 7e1584842e3..af38db39038 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java index 2473881e3c0..358bd302b4d 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications.appinfo; import static android.content.Intent.EXTRA_PACKAGE_NAME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; @@ -26,6 +28,9 @@ import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.ResolveInfo; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,9 +43,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPackageManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class TimeSpentInAppPreferenceControllerTest { 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 605da601105..00ecece3355 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.applications.appinfo; import static android.Manifest.permission.SYSTEM_ALERT_WINDOW; import static android.Manifest.permission.WRITE_SETTINGS; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -28,6 +30,8 @@ import android.content.Context; import android.content.pm.PackageInfo; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,8 +42,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class WriteSystemSettingsPreferenceControllerTest { 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 1e4de78828f..74a38511c9b 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications.assist; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -28,6 +30,10 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -39,10 +45,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; - @RunWith(SettingsRobolectricTestRunner.class) public class AssistContextPreferenceControllerTest { 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 2cb21dbdea9..10197aed4c8 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications.assist; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -31,6 +33,10 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -45,10 +51,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; - @RunWith(SettingsRobolectricTestRunner.class) public class AssistFlashScreenPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java index 8fcb31629e2..e445dc67d11 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.assist; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java index 320471c1b4f..02c1b8b4392 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.assist; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java index 57d2bcd0e56..541954b7822 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java @@ -23,11 +23,13 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.Activity; import android.content.Context; import android.os.UserManager; import android.util.Pair; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -45,9 +47,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class DefaultAppPickerFragmentTest { 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 f42c2ab6720..b9a131643e9 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.applications.defaultapps; import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -25,6 +26,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.TwoTargetPreference; @@ -37,8 +40,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class DefaultAppPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java index dd57315365b..f2d14acc2d2 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java @@ -17,12 +17,12 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.robolectric.RuntimeEnvironment.application; @@ -35,15 +35,17 @@ import android.content.res.Resources; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; + import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.ShadowProcess; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.applications.DefaultAppInfo; -import java.util.Arrays; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -53,6 +55,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; +import java.util.Arrays; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { SettingsShadowResources.SettingsShadowTheme.class, 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 4e08bad957e..61466710bff 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -28,6 +29,8 @@ import android.os.UserManager; import android.provider.Settings; import android.view.autofill.AutofillManager; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -40,8 +43,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class DefaultAutofillPreferenceControllerTest { 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 de6d5cfb97e..0ef1cf35cf8 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -35,6 +36,8 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -50,8 +53,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class DefaultBrowserPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java index 91ffb805200..e17b556307b 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java index 80e968ae832..4cf79df4d01 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyList; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java index 1f623211391..1083a998653 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyList; @@ -35,6 +36,8 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -47,8 +50,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class DefaultHomePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java index cfe30cbd11c..1d4b5c0485d 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -27,6 +28,8 @@ import android.content.pm.PackageManager; import android.nfc.NfcAdapter; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.settings.nfc.PaymentBackend; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,8 +41,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class DefaultPaymentSettingsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java index 9b088cf3932..13789302765 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java @@ -16,8 +16,11 @@ package com.android.settings.applications.manageapplications; -import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ENABLED; -import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_USAGE_ACCESS; +import static com.android.settings.applications.manageapplications.AppFilterRegistry + .FILTER_APPS_ENABLED; +import static com.android.settings.applications.manageapplications.AppFilterRegistry + .FILTER_APPS_USAGE_ACCESS; + import static com.google.common.truth.Truth.assertThat; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java index 51b6116c0da..7409136251b 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java @@ -52,6 +52,7 @@ import static com.android.settings.applications.manageapplications.ManageApplica .LIST_TYPE_USAGE_ACCESS; import static com.android.settings.applications.manageapplications.ManageApplications .LIST_TYPE_WRITE_SETTINGS; + import static com.google.common.truth.Truth.assertThat; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java index 5b0b275e16b..2ae95618572 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.manageapplications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java index cc0308c0a02..da88e543f55 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java @@ -18,13 +18,16 @@ package com.android.settings.applications.manageapplications; import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_DRAGGING; import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE; + import static com.android.settings.applications.manageapplications.AppFilterRegistry .FILTER_APPS_ALL; import static com.android.settings.applications.manageapplications.ManageApplications .LIST_TYPE_MAIN; import static com.android.settings.applications.manageapplications.ManageApplications .LIST_TYPE_NOTIFICATION; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -49,6 +52,9 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import androidx.fragment.app.FragmentActivity; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.LoadingViewController; @@ -65,9 +71,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; -import androidx.fragment.app.FragmentActivity; -import androidx.recyclerview.widget.RecyclerView; - @RunWith(SettingsRobolectricTestRunner.class) public class ManageApplicationsTest { diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java index 13295e36638..d2b6d8a2290 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.manageapplications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.nullable; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,6 +31,8 @@ import android.text.format.Formatter; import android.view.View; import android.widget.FrameLayout; +import androidx.fragment.app.Fragment; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource; @@ -42,8 +45,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.fragment.app.Fragment; - @RunWith(SettingsRobolectricTestRunner.class) public class MusicViewHolderControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java index 8f2fb65eddf..64cc1cca1f7 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.manageapplications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.nullable; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,6 +30,8 @@ import android.text.format.Formatter; import android.view.View; import android.widget.FrameLayout; +import androidx.fragment.app.Fragment; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource; @@ -41,8 +44,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.fragment.app.Fragment; - @RunWith(SettingsRobolectricTestRunner.class) public class PhotosViewHolderControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java index 2baacda8926..be3d5544d80 100644 --- a/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.managedomainurls; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -27,6 +28,8 @@ import android.util.IconDrawableFactory; import android.view.View; import android.widget.ProgressBar; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState; @@ -38,8 +41,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.UUID; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) public class DomainAppPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceControllerTest.java index fc789bf18da..cb628001fb6 100644 --- a/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceControllerTest.java @@ -16,9 +16,12 @@ package com.android.settings.applications.managedomainurls; import static android.provider.Settings.Global.ENABLE_EPHEMERAL_FEATURE; + import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceControllerTest.java index 8d1b584f7e1..6a1222d21e5 100644 --- a/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceControllerTest.java @@ -16,15 +16,20 @@ package com.android.settings.applications.managedomainurls; import static android.provider.Settings.Global.ENABLE_EPHEMERAL_FEATURE; + import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; @@ -34,8 +39,6 @@ import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class InstantAppWebActionPreferenceControllerTest { private static final String PREF_KEY = "instant_app_web_action_toggle"; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.java index c632d08bec0..ed72cf93915 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.specialaccess; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java index 4713be22512..27fb24e9e76 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.specialaccess; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListItemTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListItemTest.java index e19d9e68631..0873a18f652 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListItemTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListItemTest.java @@ -18,6 +18,7 @@ package com.android.settings.applications.specialaccess.deviceadmin; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceControllerTest.java index 7507e07567e..18ecf7d1654 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.applications.specialaccess.deviceadmin; import static androidx.lifecycle.Lifecycle.Event.ON_START; import static androidx.lifecycle.Lifecycle.Event.ON_STOP; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isNull; @@ -29,6 +30,8 @@ import android.content.Context; import android.content.IntentFilter; import android.os.UserHandle; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.widget.FooterPreferenceMixinCompat; @@ -40,8 +43,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.lifecycle.LifecycleOwner; - @RunWith(SettingsRobolectricTestRunner.class) public class DeviceAdminListPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceControllerTest.java index 8355d788988..bba2b8b74eb 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.specialaccess.pictureinpicture; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -24,6 +25,8 @@ import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; import com.android.settings.core.BasePreferenceController; @@ -36,8 +39,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class PictureInPictureDetailPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java index eb96d9406fa..9d53f956103 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.specialaccess.pictureinpicture; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettingsTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettingsTest.java index 1d1be504051..deb66c86ab7 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.specialaccess.pictureinpicture; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccessTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccessTest.java index ff4ac9f954f..3978825474e 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccessTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccessTest.java @@ -24,7 +24,6 @@ import android.content.Context; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.telephony.SmsUsageMonitor; -import com.android.settings.applications.specialaccess.premiumsms.PremiumSmsAccess; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java index 35a93c1a9b6..4244cd71b0e 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications.specialaccess.premiumsms; import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceControllerTest.java index 29ab15be0c1..0dc7da3a312 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications.specialaccess.premiumsms; import static com.android.settings.core.BasePreferenceController.AVAILABLE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java index 3fb9045a66d..6239774e17c 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.applications.specialaccess.vrlistener; import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceControllerTest.java index c5734f929c8..7a8dc5f2036 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.applications.specialaccess.vrlistener; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java index c5dfc21bec9..43b707c8024 100644 --- a/tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java @@ -20,6 +20,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; +import androidx.preference.SwitchPreference; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -31,8 +33,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowPrivacySettingsUtils.class}) public class AutoRestorePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java index 4a0f85d7f1d..f23bc93c637 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java @@ -20,6 +20,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -32,8 +34,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowPrivacySettingsUtils.class}) public class BackupDataPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java index 95d68d9d123..bcd432acc89 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java @@ -20,6 +20,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -31,8 +33,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowPrivacySettingsUtils.class}) public class BackupInactivePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java index 602ae21a17f..51a60168aef 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java @@ -17,6 +17,7 @@ package com.android.settings.backup; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.isA; @@ -30,6 +31,10 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.os.UserHandle; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; + import com.android.settings.search.SearchIndexableRaw; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -51,10 +56,6 @@ import org.robolectric.shadows.ShadowPackageManager; import java.util.List; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {BackupSettingsActivityTest.ShadowBackupSettingsHelper.class, BackupSettingsActivityTest.ShadowUserHandle.class}) diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java index d156a2daee5..f3cb850ee59 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java @@ -17,6 +17,7 @@ package com.android.settings.backup; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java index 3d3fec6b939..fb3f947eba2 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.backup; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,6 +25,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.Intent; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -36,9 +40,6 @@ import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = BackupSettingsPreferenceControllerTest.ShadowBackupSettingsHelper.class) public class BackupSettingsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java index 2e0ae5df895..5609f354261 100644 --- a/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java @@ -21,6 +21,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.content.Intent; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,8 +36,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowPrivacySettingsUtils.class}) public class ConfigureAccountPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java index 2f1f11921b9..caf20c847f0 100644 --- a/tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java @@ -21,6 +21,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.content.Intent; +import androidx.preference.Preference; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -33,8 +35,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowPrivacySettingsUtils.class}) public class DataManagementPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java index bde1c3eeca0..d2230997473 100644 --- a/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.biometrics.face; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -30,6 +32,8 @@ import android.hardware.face.Face; import android.hardware.face.FaceManager; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; @@ -45,8 +49,6 @@ import org.robolectric.shadows.ShadowApplication; import java.util.Collections; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class FaceStatusPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java index da91a1dae51..c01f688e904 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java @@ -17,6 +17,7 @@ package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java index 147ed1d482d..d51c6a58ed8 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java @@ -17,6 +17,7 @@ package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java index 888b061022f..834aea5d5fa 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java @@ -17,6 +17,7 @@ package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java index 8c90cb7b2ce..03b96ede471 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import android.content.Context; @@ -24,6 +25,8 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.FrameLayout; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -35,8 +38,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) public class FingerprintPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java index fe3f5b06df6..7606202040a 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.biometrics.fingerprint; import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java index cb228374b0f..b47fd08d507 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.biometrics.fingerprint; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -30,6 +32,8 @@ import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; @@ -45,8 +49,6 @@ import org.robolectric.shadows.ShadowApplication; import java.util.Collections; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class FingerprintStatusPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java index 310674e3bc7..393d86ee675 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java @@ -17,6 +17,7 @@ package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.RuntimeEnvironment.application; import android.app.Activity; diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java index 797a202995a..86a5f7117d6 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java @@ -17,12 +17,15 @@ package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.RuntimeEnvironment.application; import android.content.Intent; import android.hardware.fingerprint.FingerprintManager; import android.widget.Button; +import androidx.appcompat.app.AlertDialog; + import com.android.settings.R; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.testutils.FakeFeatureFactory; @@ -41,8 +44,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; import org.robolectric.annotation.Config; -import androidx.appcompat.app.AlertDialog; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { SettingsShadowResources.SettingsShadowTheme.class, diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java index 36ccc68df88..c85a56952e1 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java @@ -17,6 +17,7 @@ package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.RuntimeEnvironment.application; import android.app.KeyguardManager; @@ -29,7 +30,8 @@ import android.widget.Button; import com.android.settings.R; import com.android.settings.biometrics.BiometricEnrollBase; import com.android.settings.biometrics.BiometricEnrollIntroduction; -import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollIntroductionTest.ShadowStorageManagerWrapper; +import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollIntroductionTest + .ShadowStorageManagerWrapper; import com.android.settings.password.SetupChooseLockGeneric.SetupChooseLockGenericFragment; import com.android.settings.password.SetupSkipDialog; import com.android.settings.password.StorageManagerWrapper; diff --git a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java index 1e323ef4db9..446b71c4728 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java index 78af1d12c51..d17fd9640a0 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -27,6 +28,9 @@ import static org.mockito.Mockito.when; import android.view.View; import android.widget.Button; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; @@ -39,9 +43,6 @@ import org.mockito.ArgumentCaptor; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowBluetoothDevice.class) public class BluetoothDetailsButtonsControllerTest extends BluetoothDetailsControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java index ba9fe1233b8..aa3985a5f9a 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java @@ -23,6 +23,9 @@ import static org.mockito.Mockito.verify; import android.content.Context; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDevice; @@ -32,9 +35,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.annotation.Config; -import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowBluetoothDevice.class) public class BluetoothDetailsControllerEventsTest extends BluetoothDetailsControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java index 95508bc8e48..509ebc8420e 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java @@ -24,6 +24,11 @@ import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothManager; import android.content.Context; +import androidx.fragment.app.FragmentActivity; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.bluetooth.CachedBluetoothDevice; @@ -35,11 +40,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.fragment.app.FragmentActivity; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothDetailsControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java index 3860617200d..3f19ccb8497 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.inOrder; @@ -27,6 +28,10 @@ import static org.mockito.Mockito.when; import android.graphics.drawable.Drawable; import android.view.View; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.FakeFeatureFactory; @@ -46,10 +51,6 @@ import org.mockito.InOrder; import org.mockito.Mock; import org.robolectric.annotation.Config; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {SettingsShadowBluetoothDevice.class, ShadowEntityHeaderController.class}) diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java index 848cdffe982..e321b4b05a4 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -28,6 +29,9 @@ import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; +import androidx.preference.PreferenceCategory; +import androidx.preference.SwitchPreference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; @@ -51,9 +55,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import androidx.preference.PreferenceCategory; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {SettingsShadowBluetoothDevice.class, ShadowBluetoothDevice.class}) public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java index 9a35345c11c..9651a899a89 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java index afce68efbac..5d2718c52f3 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; @@ -24,12 +25,14 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.bluetooth.BluetoothAdapter; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -38,9 +41,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class BluetoothDeviceNamePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java index 6256a3db1b3..d1299442b8a 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java index 0fdfc526693..9de46dd3c10 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; @@ -27,8 +28,14 @@ import static org.mockito.Mockito.when; import android.bluetooth.BluetoothAdapter; import android.content.Context; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -36,11 +43,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; - -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentTransaction; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java index f338e3668d2..28bf3ab8903 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -26,6 +27,7 @@ import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.content.Context; import android.content.Intent; + import androidx.preference.Preference; import com.android.settings.SettingsActivity; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java index 927f622b08e..6c78c65c889 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Mockito.mock; @@ -33,6 +34,8 @@ import android.content.IntentFilter; import android.os.UserManager; import android.view.View; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; @@ -54,8 +57,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class, ShadowBluetoothAdapter.class}) public class BluetoothEnablerTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java index c3bc9a1880c..f9129757b52 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -25,6 +26,8 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -35,8 +38,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothFilesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java index 8da659e1cae..b28a8b2b825 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; import static android.bluetooth.BluetoothDevice.PAIRING_VARIANT_CONSENT; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java index 649184350b3..7fd82b8eccd 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; @@ -31,6 +32,8 @@ import android.bluetooth.BluetoothAdapter; import android.content.Context; import android.content.res.Resources; +import androidx.preference.PreferenceGroup; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; @@ -48,8 +51,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; -import androidx.preference.PreferenceGroup; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class BluetoothPairingDetailTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java index 6cd924a4cc5..37cc1e77599 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.fail; import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; @@ -35,6 +36,8 @@ import android.view.inputmethod.InputMethodManager; import android.widget.CheckBox; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; @@ -49,8 +52,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.appcompat.app.AlertDialog; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class}) public class BluetoothPairingDialogTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java index f53a2f5f72d..be86241fd4a 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.spy; @@ -26,6 +27,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.Intent; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,8 +41,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothPairingPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java index 75361d71b97..bfbdd7f78a4 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java @@ -18,6 +18,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -27,6 +28,14 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; +import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.widget.SliceLiveData; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; @@ -41,14 +50,6 @@ import org.robolectric.annotation.Config; import java.util.List; -import androidx.core.graphics.drawable.IconCompat; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.widget.SliceLiveData; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowLocalBluetoothProfileManager.class}) public class BluetoothSliceBuilderTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java index 2cab95bf7dd..d3c195f8f43 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doCallRealMethod; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java index cca9ff0954b..e53c86e1c8b 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; @@ -27,13 +28,11 @@ import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.utils.AnnotationSpan; import com.android.settings.widget.SwitchWidgetController; -import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.widget.FooterPreference; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java index a86f3f3d75c..f4364b79e9c 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java index c64b904a02a..649728ec639 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; @@ -28,6 +29,8 @@ import android.bluetooth.BluetoothAdapter; import android.content.Context; import android.content.res.Resources; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; @@ -44,8 +47,6 @@ import org.robolectric.annotation.Config; import java.util.List; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class DeviceListPreferenceFragmentTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java index 8532cc11517..d6d31ea05e0 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -24,6 +25,9 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.FragmentActivity; + import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; @@ -39,9 +43,6 @@ import org.robolectric.Robolectric; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowDialog; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.FragmentActivity; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResourcesImpl.class) public class ForgetDeviceDialogFragmentTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java index 49d72fbd0ee..d9867cf1ba4 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -26,6 +27,8 @@ import android.content.Context; import android.view.View; import android.view.inputmethod.InputMethodManager; +import androidx.appcompat.app.AlertDialog; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; @@ -43,8 +46,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -import androidx.appcompat.app.AlertDialog; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class}) public class LocalDeviceNameDialogFragmentTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java index c3ba7d1c85a..4f02062cc63 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java @@ -17,8 +17,11 @@ package com.android.settings.connecteddevice; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; + import static junit.framework.Assert.assertTrue; + import static org.mockito.Mockito.when; import android.bluetooth.BluetoothAdapter; @@ -28,6 +31,8 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.text.TextUtils; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; @@ -43,8 +48,6 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplicationPackageManager; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowApplicationPackageManager.class) public class AddDevicePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java index e3e3fc573d5..f0be229bb7b 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java @@ -16,7 +16,9 @@ package com.android.settings.connecteddevice; import static com.android.settings.core.BasePreferenceController.AVAILABLE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.ContentResolver; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java index 4529f03838a..eecbca5afe2 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java @@ -19,7 +19,9 @@ import static com.android.settings.connecteddevice.ConnectedDeviceDashboardFragm .KEY_AVAILABLE_DEVICES; import static com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment .KEY_CONNECTED_DEVICES; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java index e6ef2d9d3c1..bd6f508201c 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.connecteddevice; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -29,6 +30,8 @@ import android.content.pm.PackageManager; import android.text.BidiFormatter; import android.text.TextUtils; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.bluetooth.AlwaysDiscoverable; import com.android.settings.core.BasePreferenceController; @@ -52,8 +55,6 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothPan.class, ShadowBluetoothAdapter.class}) public class DiscoverableFooterPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java index f89bcce9fb2..fc08016f4d0 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.connecteddevice; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,6 +27,8 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.content.pm.PackageManager; +import androidx.preference.Preference; + import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.dashboard.DashboardFragment; @@ -37,8 +41,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class PreviouslyConnectedDevicePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java index a6cac5dfdcb..e85626df5ed 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.connecteddevice; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,6 +27,9 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.content.pm.PackageManager; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceManager; + import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.dashboard.DashboardFragment; @@ -39,9 +44,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.PreferenceManager; - @RunWith(SettingsRobolectricTestRunner.class) public class SavedDeviceGroupControllerTest { private static final String PREFERENCE_KEY_1 = "pref_key_1"; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java index 306803225e7..ad04e7e52ab 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java @@ -16,6 +16,7 @@ package com.android.settings.connecteddevice.usb; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java index 567b072fdda..9ad73bedb6e 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java @@ -17,6 +17,7 @@ package com.android.settings.connecteddevice.usb; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiverTest.java index 06e752215da..7317ea99216 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiverTest.java @@ -16,6 +16,7 @@ package com.android.settings.connecteddevice.usb; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java index dca10d73390..8aec1f7af85 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.connecteddevice.usb; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java index 3771262ce08..dfd4eae7546 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.connecteddevice.usb; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -26,6 +27,11 @@ import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; import android.os.Handler; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.RadioButtonPreference; @@ -39,11 +45,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class UsbDetailsDataRoleControllerTest { 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 d41210ddb2a..888a1f3d597 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.connecteddevice.usb; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -25,6 +26,11 @@ import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; +import androidx.fragment.app.FragmentActivity; +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; import com.android.settings.widget.RadioButtonPreference; @@ -42,11 +48,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class UsbDetailsFunctionsControllerTest { 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 321b1b2c299..f34446cfbf8 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java @@ -23,6 +23,11 @@ import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; +import androidx.fragment.app.FragmentActivity; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -40,11 +45,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.fragment.app.FragmentActivity; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowEntityHeaderController.class) public class UsbDetailsHeaderControllerTest { 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 ca3d0cfcbae..856ac193d22 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.connecteddevice.usb; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -27,6 +28,12 @@ import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; import android.os.Handler; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -39,12 +46,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class UsbDetailsPowerRoleControllerTest { diff --git a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java index 237e69a8b2d..044ecc9961b 100644 --- a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java @@ -21,13 +21,18 @@ import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_U import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING; import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.slices.SliceData; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,9 +44,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; -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 6c3b4afd4d6..6f309de2298 100644 --- a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java @@ -25,6 +25,10 @@ import static org.mockito.Mockito.when; import android.os.Bundle; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,10 +40,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.util.ReflectionHelpers; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class InstrumentedPreferenceFragmentTest { diff --git a/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java index 03473366212..c57c384ab19 100644 --- a/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java @@ -18,6 +18,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; +import androidx.preference.SeekBarPreference; + import com.android.settings.slices.SliceData; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -26,8 +28,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.preference.SeekBarPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class SliderPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java b/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java index 2467e5770a0..fd3b4a09424 100644 --- a/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java +++ b/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java @@ -17,6 +17,7 @@ package com.android.settings.core; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -29,6 +30,9 @@ import android.content.Context; import android.content.Intent; import android.os.UserHandle; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; + import com.android.settings.SettingsActivity; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin; @@ -41,9 +45,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; - @RunWith(SettingsRobolectricTestRunner.class) public class SubSettingLauncherTest { diff --git a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java index ae5d7aaf0bb..53fe9a8b454 100644 --- a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java @@ -19,6 +19,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; +import androidx.preference.SwitchPreference; + import com.android.settings.slices.SliceData; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -27,8 +29,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class TogglePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java index 36c3ae7cc93..9480e6d06fa 100644 --- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java +++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java @@ -20,6 +20,8 @@ import static com.google.common.truth.Truth.assertWithMessage; import android.util.ArraySet; +import androidx.fragment.app.Fragment; + import com.android.settings.core.codeinspection.CodeInspector; import com.android.settingslib.core.instrumentation.Instrumentable; @@ -27,8 +29,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import androidx.fragment.app.Fragment; - /** * {@link CodeInspector} that verifies all fragments implements Instrumentable. */ diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java index 69cb0817fa2..7106cf6fecc 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java @@ -18,6 +18,8 @@ package com.android.settings.dashboard; import android.content.Context; +import androidx.fragment.app.Fragment; + import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerListHelper; import com.android.settings.search.DatabaseIndexingUtils; @@ -28,8 +30,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.List; -import androidx.fragment.app.Fragment; - public class DashboardFragmentSearchIndexProviderInspector { public static boolean isSharingPreferenceControllers(Class clazz) { diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java index 1759fffc9ca..a4fba72f29b 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java @@ -17,6 +17,7 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doNothing; @@ -29,6 +30,9 @@ import static org.mockito.Mockito.when; import android.content.Context; +import androidx.fragment.app.FragmentActivity; +import androidx.recyclerview.widget.LinearLayoutManager; + import com.android.settings.homepage.conditional.ConditionManager; import com.android.settings.homepage.conditional.FocusRecyclerView; import com.android.settings.testutils.FakeFeatureFactory; @@ -45,9 +49,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.fragment.app.FragmentActivity; -import androidx.recyclerview.widget.LinearLayoutManager; - @RunWith(SettingsRobolectricTestRunner.class) public class DashboardSummaryTest { diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java index 77f7fde7e1b..d5636a16d5b 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java @@ -17,12 +17,16 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -32,9 +36,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class DashboardTilePlaceholderPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java index c5e6b9d1720..a48264780ce 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java @@ -16,6 +16,7 @@ package com.android.settings.dashboard.suggestions; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java index 5ff88bd42e6..3a827960a32 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java @@ -17,6 +17,7 @@ package com.android.settings.dashboard.suggestions; import static android.content.Intent.EXTRA_COMPONENT_NAME; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java index 5de54ea2774..99a3629c05a 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.graphics.Color; diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java index 230aee9705a..261fac361f6 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java @@ -34,6 +34,9 @@ import android.os.Bundle; import android.util.ArraySet; import android.view.View; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; @@ -54,9 +57,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowEntityHeaderController.class, ShadowRestrictedLockUtils.class}) public class AppDataUsageTest { diff --git a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java index 13072d587ed..e3034f88c21 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java @@ -17,6 +17,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; @@ -28,6 +29,8 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.graphics.drawable.Drawable; import android.util.ArraySet; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -37,8 +40,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class AppPrefLoaderTest { diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java index 2d446288947..eb5e4911664 100644 --- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java @@ -16,8 +16,10 @@ package com.android.settings.datausage; import static android.net.NetworkPolicy.CYCLE_NONE; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; import static org.mockito.Matchers.anyObject; @@ -32,6 +34,10 @@ import android.content.DialogInterface; import android.content.SharedPreferences; import android.os.Bundle; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.NetworkPolicyEditor; @@ -42,10 +48,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; -import androidx.preference.PreferenceManager; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class BillingCycleSettingsTest { diff --git a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java index 62751dd9ee7..744096622fd 100644 --- a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java @@ -16,6 +16,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; @@ -26,6 +27,8 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -35,8 +38,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) public class CellDataPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java index e053e161a45..ce58ae23c8d 100644 --- a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java @@ -16,6 +16,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java index 206f149a588..0140d6fa3e0 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java @@ -17,6 +17,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -29,6 +30,8 @@ import android.net.NetworkTemplate; import android.os.Bundle; import android.provider.Settings; +import androidx.fragment.app.FragmentActivity; + import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.NetworkPolicyEditor; @@ -40,8 +43,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.util.ReflectionHelpers; -import androidx.fragment.app.FragmentActivity; - @RunWith(SettingsRobolectricTestRunner.class) public class DataUsageListTest { diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java index 6398361fb6e..254e4f6f654 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java @@ -17,9 +17,12 @@ package com.android.settings.datausage; import static android.net.ConnectivityManager.TYPE_WIFI; + import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -35,6 +38,9 @@ import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import androidx.fragment.app.FragmentActivity; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; @@ -59,9 +65,6 @@ import org.robolectric.annotation.Config; import java.util.concurrent.TimeUnit; -import androidx.fragment.app.FragmentActivity; -import androidx.recyclerview.widget.RecyclerView; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowEntityHeaderController.class) public class DataUsageSummaryPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java index 94716f919d8..8964d889771 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java @@ -17,11 +17,11 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import android.app.Activity; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -36,6 +36,9 @@ import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SubSettings; @@ -55,9 +58,6 @@ import org.robolectric.shadows.ShadowActivity; import java.util.concurrent.TimeUnit; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResourcesImpl.class) public class DataUsageSummaryPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java index 9651054bf4d..e52ff20ac50 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java @@ -17,6 +17,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.anyString; @@ -30,6 +31,8 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.net.NetworkPolicyManager; +import androidx.fragment.app.FragmentActivity; + import com.android.settings.dashboard.SummaryLoader; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; @@ -47,8 +50,6 @@ import org.robolectric.Robolectric; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -import androidx.fragment.app.FragmentActivity; - @Config(shadows = { SettingsShadowResourcesImpl.class, SettingsShadowResources.SettingsShadowTheme.class, diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java index a35c897df05..0270be4b4cd 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java @@ -17,6 +17,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java index 66bcfbd6134..b3576304e03 100644 --- a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.nullable; @@ -32,6 +33,9 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.os.Process; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.AppStateBaseBridge; @@ -54,9 +58,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { ShadowRestrictedLockUtils.class, diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java index 762642d9a9e..f1795f3d0e6 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java @@ -23,6 +23,8 @@ import android.content.Intent; import android.provider.Settings; import android.text.format.DateFormat; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -36,8 +38,6 @@ import org.robolectric.shadows.ShadowApplication; import java.util.List; import java.util.Locale; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class AutoTimeFormatPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java index e725877eadf..4d1ba380a5e 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java index 0193484b9ca..11b2efdfc07 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.robolectric.shadow.api.Shadow.extract; @@ -24,6 +25,8 @@ import android.content.Context; import android.net.ConnectivityManager; import android.provider.Settings; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; @@ -35,8 +38,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowConnectivityManager.class) public class AutoTimeZonePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java index 7fd5b46ac0a..0f5e0880b95 100644 --- a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java index 802d9edb120..ee495d361f6 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java index 244ca5cc0f9..5180455fc49 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java @@ -17,12 +17,16 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import android.content.Context; import android.content.Intent; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -35,9 +39,6 @@ import org.robolectric.shadows.ShadowApplication; import java.util.List; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class TimeFormatPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java index c6f99a3c656..d73c8db54f1 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java index 38aace86e7b..a8c09f26006 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java index b1b14f57330..365bfa2a33c 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java @@ -18,6 +18,8 @@ package com.android.settings.datetime.timezone; import static com.google.common.truth.Truth.assertThat; +import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; @@ -29,8 +31,6 @@ import java.util.Locale; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver; - @RunWith(SettingsRobolectricTestRunner.class) public class BaseTimeZoneAdapterTest { 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 d801e8c4a48..06d2b2bca7d 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java @@ -21,6 +21,8 @@ import static com.google.common.truth.Truth.assertThat; import android.app.Activity; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -28,8 +30,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class BaseTimeZonePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java index d2457f57aac..9f3453d542b 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime.timezone; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java index 1d119e737a8..6802e8aa30a 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java @@ -21,6 +21,8 @@ import static com.google.common.truth.Truth.assertThat; import android.app.Activity; import android.icu.util.TimeZone; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -28,8 +30,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class FixedOffsetPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java index 878384e0446..f33311523dc 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java @@ -20,6 +20,8 @@ import static com.google.common.truth.Truth.assertThat; import android.app.Activity; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -27,8 +29,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class RegionPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java index 6addd6f7ef8..9861d70bade 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime.timezone; import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -24,6 +25,9 @@ import static org.mockito.Mockito.when; import android.widget.Filter; import android.widget.LinearLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; + import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem; import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.ItemViewHolder; import com.android.settings.datetime.timezone.RegionSearchPicker.RegionItem; @@ -45,9 +49,6 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { RegionSearchPickerTest.ShadowBaseTimeZonePicker.class, 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 9478e06a44d..3c98985c12b 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java @@ -21,6 +21,8 @@ import static com.google.common.truth.Truth.assertThat; import android.app.Activity; import android.icu.util.TimeZone; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -28,8 +30,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class RegionZonePreferenceControllerTest { 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 b5522b39d82..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,6 +19,8 @@ package com.android.settings.datetime.timezone; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.spy; +import androidx.preference.Preference; + import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -29,8 +31,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.Date; import java.util.Locale; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class TimeZoneInfoPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java index 725313e33f2..51d4a4b53a1 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime.timezone; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java index d388dcda6a8..d7fdd2ca4c5 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime.timezone.model; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java index f95260592dc..b6a93227262 100644 --- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java @@ -7,6 +7,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -19,9 +22,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class AutomaticStorageManagerDescriptionPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java index f78d8f955b2..073078b4654 100644 --- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.deletionhelper; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.never; @@ -27,6 +28,10 @@ import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -41,10 +46,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class AutomaticStorageManagerSwitchBarControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java index b876de09d98..2ed09420765 100644 --- a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.development; import static com.android.settings.development.AbstractBluetoothA2dpPreferenceController .STREAMING_LABEL_ID; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -30,6 +31,10 @@ import android.bluetooth.BluetoothA2dp; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -40,10 +45,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class AbstractBluetoothA2dpPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java index 2e8ff8528e6..ef7e076e285 100644 --- a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -26,6 +27,9 @@ import android.content.Context; import android.os.UserManager; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -35,9 +39,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class AdbPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java index b5a27234673..2175f39a170 100644 --- a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java @@ -20,13 +20,18 @@ import static com.android.settings.development.AllowAppsOnExternalPreferenceCont .SETTING_VALUE_OFF; import static com.android.settings.development.AllowAppsOnExternalPreferenceController .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -36,9 +41,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class AllowAppsOnExternalPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java index 1312c89dfa8..accd05b8a10 100644 --- a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java @@ -20,6 +20,7 @@ import static com.android.settings.development.AnimatorDurationScalePreferenceCo .ANIMATOR_DURATION_SCALE_SELECTOR; import static com.android.settings.development.AnimatorDurationScalePreferenceController .DEFAULT_VALUE; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -27,6 +28,9 @@ import android.content.Context; import android.os.RemoteException; import android.view.IWindowManager; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,9 +42,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class AnimatorDurationScalePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java index 358c824f487..e1fc149a19e 100644 --- a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java @@ -20,13 +20,18 @@ import static com.android.settings.development.AppsNotRespondingPreferenceContro .SETTING_VALUE_OFF; import static com.android.settings.development.AppsNotRespondingPreferenceController .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -36,9 +41,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class AppsNotRespondingPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java index c58fa6412c3..6878c324107 100644 --- a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java @@ -25,6 +25,9 @@ import android.app.IActivityManager; import android.content.Context; import android.os.RemoteException; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -35,9 +38,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class BackgroundProcessLimitPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java index 75c0f458dde..69c8d2b506d 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java @@ -18,13 +18,18 @@ package com.android.settings.development; import static com.android.settings.development.BluetoothA2dpHwOffloadPreferenceController .A2DP_OFFLOAD_DISABLED_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -34,9 +39,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothA2dpHwOffloadPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java index 76696d266f6..9cc74369bea 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java @@ -18,13 +18,18 @@ package com.android.settings.development; import static com.android.settings.development.BluetoothAbsoluteVolumePreferenceController .BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -34,9 +39,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothAbsoluteVolumePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java index 482770017ae..a4da1973db6 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,6 +25,10 @@ import static org.mockito.Mockito.when; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -34,10 +39,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothAudioBitsPerSamplePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java index b857730d34b..eb1737b2b64 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,6 +25,10 @@ import static org.mockito.Mockito.when; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -34,10 +39,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothAudioChannelModePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java index cf24c091b5c..23eea32dc9c 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,6 +25,10 @@ import static org.mockito.Mockito.when; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -34,10 +39,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothAudioCodecPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java index dd9fa05bcd4..516c8b28af5 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,6 +25,10 @@ import static org.mockito.Mockito.when; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -34,10 +39,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothAudioQualityPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java index 1654a68df3c..cb9337f4820 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,6 +25,10 @@ import static org.mockito.Mockito.when; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -34,10 +39,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothAudioSampleRatePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java index 2441a4719e5..2d0c70a938c 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.development; import static com.android.settings.development.BluetoothAvrcpVersionPreferenceController .BLUETOOTH_AVRCP_VERSION_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -26,6 +28,9 @@ import android.content.Context; import android.content.res.Resources; import android.os.SystemProperties; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,9 +41,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothAvrcpVersionPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java index 23ea1e8898c..0cab3ece6df 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java @@ -18,12 +18,17 @@ package com.android.settings.development; import static com.android.settings.development.BluetoothDeviceNoNamePreferenceController .BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -34,9 +39,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowSystemProperties; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothDeviceNoNamePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java index a454b8e3448..030aaa2f871 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.development; import static com.android.settings.development .BluetoothMaxConnectedAudioDevicesPreferenceController.MAX_CONNECTED_AUDIO_DEVICES_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -26,6 +28,9 @@ import android.content.Context; import android.content.res.Resources; import android.os.SystemProperties; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,9 +42,6 @@ import org.mockito.MockitoAnnotations; import org.mockito.Spy; import org.robolectric.RuntimeEnvironment; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothMaxConnectedAudioDevicesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java index b4038a76cb9..0d75bdb5be7 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java @@ -18,13 +18,18 @@ package com.android.settings.development; import static com.android.settings.development.BluetoothSnoopLogPreferenceController .BLUETOOTH_BTSNOOP_ENABLE_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -33,9 +38,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothSnoopLogPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java index af63dc34ea5..b4ee99cb319 100644 --- a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java @@ -20,7 +20,9 @@ import static com.android.settings.development.BugReportInPowerPreferenceControl .SETTING_VALUE_OFF; import static com.android.settings.development.BugReportInPowerPreferenceController .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,6 +32,9 @@ import android.content.Context; import android.os.UserManager; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -39,9 +44,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class BugReportInPowerPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java index 77bd6b868ec..39fd368593a 100644 --- a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java index 033cb260dd3..d39a8c2b8fd 100644 --- a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java @@ -20,12 +20,17 @@ import static com.android.settings.development.CameraLaserSensorPreferenceContro import static com.android.settings.development.CameraLaserSensorPreferenceController .USERDEBUG_BUILD; import static com.android.settings.development.CameraLaserSensorPreferenceController.USER_BUILD; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.os.SystemProperties; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -36,9 +41,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class CameraLaserSensorPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java index 6c7c1ebba1b..56f1944147a 100644 --- a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.development; import static com.android.settings.development.ClearAdbKeysPreferenceController .RO_ADB_SECURE_PROPERTY_KEY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -30,6 +32,10 @@ import android.hardware.usb.IUsbManager; import android.os.RemoteException; import android.os.SystemProperties; +import androidx.fragment.app.Fragment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; @@ -45,10 +51,6 @@ import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.util.ReflectionHelpers; -import androidx.fragment.app.Fragment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowUtils.class) public class ClearAdbKeysPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java index 4b9280173b9..8d9549ab623 100644 --- a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java @@ -18,13 +18,18 @@ package com.android.settings.development; import static com.android.settings.development.CoolColorTemperaturePreferenceController .COLOR_TEMPERATURE_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -35,9 +40,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class CoolColorTemperaturePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java index f2403405943..d2019280a65 100644 --- a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,6 +25,9 @@ import android.content.Context; import android.os.SystemProperties; import android.view.ThreadedRenderer; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,9 +38,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class DebugGpuOverdrawPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java index 4a63783d377..a3728602796 100644 --- a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,6 +25,9 @@ import android.content.Context; import android.os.SystemProperties; import android.view.ThreadedRenderer; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,9 +38,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class DebugNonRectClipOperationsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java index 7c4cc979bac..e737077eb13 100644 --- a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java @@ -17,12 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -32,9 +36,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class DebugViewAttributesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java index da32ce81909..fffcd4c8f0f 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java index e026ca1e829..a6d11e903d8 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java @@ -18,12 +18,16 @@ package com.android.settings.development; import static androidx.lifecycle.Lifecycle.Event.ON_START; import static androidx.lifecycle.Lifecycle.Event.ON_STOP; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.widget.SwitchBar; @@ -43,8 +47,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.List; -import androidx.lifecycle.LifecycleOwner; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowUtils.class) public class DevelopmentSwitchBarControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java index 08f5e0b8878..8bc3ef68b17 100644 --- a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java @@ -17,12 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -32,9 +36,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class DisableAutomaticUpdatesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java index a213f6a6e81..1b25460355b 100644 --- a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java @@ -33,21 +33,20 @@ import android.content.pm.PackageManager; import android.os.RemoteException; import android.view.DisplayCutout; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.AdditionalMatchers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.Arrays; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class EmulateDisplayCutoutPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java index bb7b3adc050..1319c979fce 100644 --- a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java @@ -20,13 +20,18 @@ import static com.android.settings.development.EnableGnssRawMeasFullTrackingPref .SETTING_VALUE_OFF; import static com.android.settings.development.EnableGnssRawMeasFullTrackingPreferenceController .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -36,9 +41,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class EnableGnssRawMeasFullTrackingPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java index 01764646ef8..21d14ca3fa2 100644 --- a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java @@ -20,13 +20,18 @@ import static com.android.settings.development.EnableGpuDebugLayersPreferenceCon .SETTING_VALUE_OFF; import static com.android.settings.development.EnableGpuDebugLayersPreferenceController .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -36,9 +41,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class EnableGpuDebugLayersPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java index 65ca41a66d1..8bbb7e2f0fb 100644 --- a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.development; import static com.android.settings.development.FileEncryptionPreferenceController .FILE_ENCRYPTION_PROPERTY_KEY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.never; @@ -30,6 +32,9 @@ import android.os.RemoteException; import android.os.SystemProperties; import android.os.storage.IStorageManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -41,9 +46,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class FileEncryptionPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java index 9d3ff8dcf54..a238e7630e8 100644 --- a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java @@ -17,12 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -32,9 +36,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class ForceMSAAPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java index fd5175c4518..b58f756169a 100644 --- a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java @@ -20,7 +20,9 @@ import static com.android.settings.development.FreeformWindowsPreferenceControll .SETTING_VALUE_OFF; import static com.android.settings.development.FreeformWindowsPreferenceController.SETTING_VALUE_ON; import static com.android.settings.development.FreeformWindowsPreferenceController.USER_BUILD_TYPE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -29,6 +31,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -38,9 +43,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class FreeformWindowsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java index c15b6ec5e1e..d2e2d31ce56 100644 --- a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,6 +25,9 @@ import android.content.Context; import android.os.SystemProperties; import android.view.ThreadedRenderer; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -33,9 +37,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class GpuViewUpdatesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java index df747c5e0b7..9ab7cec4a11 100644 --- a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java @@ -17,12 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.os.SystemProperties; import android.view.ThreadedRenderer; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -32,9 +36,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class HardwareLayersUpdatesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java index 7da9ad28eda..9a69acfb220 100644 --- a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.development; import static com.android.settings.development.HardwareOverlaysPreferenceController .SURFACE_FLINGER_READ_CODE; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.eq; @@ -32,6 +33,9 @@ import android.content.Context; import android.os.IBinder; import android.os.RemoteException; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowParcel; @@ -43,9 +47,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class HardwareOverlaysPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java index 29ec6a06201..9a80bea96cc 100644 --- a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.development; import static com.android.settings.development.HdcpCheckingPreferenceController .HDCP_CHECKING_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -27,6 +29,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,9 +42,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class HdcpCheckingPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/HighFrequencyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HighFrequencyPreferenceControllerTest.java index cf8babb5114..700f544bc5e 100644 --- a/tests/robotests/src/com/android/settings/development/HighFrequencyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HighFrequencyPreferenceControllerTest.java @@ -16,12 +16,6 @@ package com.android.settings.development; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,8 +24,10 @@ import android.content.Context; import android.os.IBinder; import android.os.RemoteException; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.ShadowParcel; import org.junit.Before; import org.junit.Test; @@ -39,12 +35,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class HighFrequencyPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java index 0df11af806c..a71f9b0848a 100644 --- a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.android.settings.development.KeepActivitiesPreferenceController.SETTING_VALUE_OFF; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -27,6 +28,9 @@ import android.content.Context; import android.os.RemoteException; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -36,9 +40,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class KeepActivitiesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java index 8b80831cdfd..b0af1d5676e 100644 --- a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java @@ -12,6 +12,9 @@ import android.content.Context; import android.os.RemoteException; import android.os.UserManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -23,9 +26,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class LocalBackupPasswordPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java index 5bcfa3dc518..04de34822ae 100644 --- a/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.development; import static com.android.settings.development.LocalTerminalPreferenceController .TERMINAL_APP_PACKAGE; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -28,6 +29,9 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.UserManager; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -36,9 +40,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class LocalTerminalPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java index 51dd34a6ddc..afbd806bb40 100644 --- a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java @@ -23,6 +23,10 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -33,10 +37,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class LogPersistPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java index 3ea25e1b703..aee0ba81900 100644 --- a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java @@ -21,6 +21,9 @@ import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.R; @@ -31,9 +34,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class LogdSizePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java index 14ecc3aa6e6..481e59869b2 100644 --- a/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java @@ -23,6 +23,9 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.applications.ProcStatsData; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -33,9 +36,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class MemoryUsagePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java index a7e28b21ed0..7424753a66f 100644 --- a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java @@ -17,12 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -32,9 +36,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class MobileDataAlwaysOnPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java index a8f534129c2..f6214aea988 100644 --- a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java @@ -2,7 +2,9 @@ package com.android.settings.development; import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes .REQUEST_MOCK_LOCATION_APP; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; @@ -18,6 +20,9 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -31,9 +36,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.Collections; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class MockLocationAppPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java index dbac1baccdd..965f756d6b9 100644 --- a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; */ import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,6 +26,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -34,9 +38,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class NotificationChannelWarningsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java index fb0ed7945a9..03f82000fea 100644 --- a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.development; import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes .REQUEST_CODE_ENABLE_OEM_UNLOCK; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -33,6 +35,9 @@ import android.os.UserManager; import android.service.oemlock.OemLockManager; import android.telephony.TelephonyManager; +import androidx.fragment.app.FragmentManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedSwitchPreference; @@ -43,9 +48,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.fragment.app.FragmentManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class OemUnlockPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java index cdbcb5ceb4f..8140c324de0 100644 --- a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.development; import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -27,6 +29,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -37,9 +42,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class PictureColorModePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java index 55234b81ea4..768ccec1c6a 100644 --- a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java @@ -17,12 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -32,9 +36,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class PointerLocationPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java index 68f11606f43..1708068d359 100644 --- a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,6 +25,9 @@ import android.content.Context; import android.os.SystemProperties; import android.view.ThreadedRenderer; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,9 +38,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class ProfileGpuRenderingPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java index 4808cefdd53..046636b9f32 100644 --- a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java @@ -17,12 +17,16 @@ package com.android.settings.development; */ import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -32,9 +36,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class ResizableActivityPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java index f490add9848..f79cbe0bf51 100644 --- a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,6 +26,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -34,9 +38,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class RtlLayoutPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java index d29113030b4..6b083da5d79 100644 --- a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,6 +25,9 @@ import android.content.Context; import android.content.res.Resources; import android.provider.Settings; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,9 +38,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class SecondaryDisplayPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java index 85a3b63cce3..0d9eeda33a0 100644 --- a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.development; import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes .REQUEST_CODE_DEBUG_APP; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -31,6 +33,9 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -42,9 +47,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class SelectDebugAppPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java index 6b5202d9668..04b0b3f1ab6 100644 --- a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,6 +25,9 @@ import android.content.Context; import android.content.pm.IShortcutService; import android.os.RemoteException; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -34,9 +38,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class ShortcutManagerThrottlingPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java index 2080493801c..2acd44ad092 100644 --- a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java @@ -20,12 +20,17 @@ import static com.android.settings.development.ShowFirstCrashDialogPreferenceCon .SETTING_VALUE_OFF; import static com.android.settings.development.ShowFirstCrashDialogPreferenceController .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -35,9 +40,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class ShowFirstCrashDialogPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java index ee32c0bcf6d..38ec01b80de 100644 --- a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java @@ -17,12 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.os.SystemProperties; import android.view.View; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -32,9 +36,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class ShowLayoutBoundsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java index 46e50fe1da0..e768e522d87 100644 --- a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.development; import static com.android.settings.development.ShowSurfaceUpdatesPreferenceController .SURFACE_FLINGER_READ_CODE; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.eq; @@ -32,6 +33,9 @@ import android.content.Context; import android.os.IBinder; import android.os.RemoteException; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowParcel; @@ -43,9 +47,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class ShowSurfaceUpdatesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java index 4fa5bf93049..b6d02caf11e 100644 --- a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java @@ -17,12 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -32,9 +36,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class ShowTapsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java index 9760b55ba76..633e8e4055d 100644 --- a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java @@ -20,7 +20,9 @@ import static com.android.settings.development.SimulateColorSpacePreferenceContr .SETTING_VALUE_OFF; import static com.android.settings.development.SimulateColorSpacePreferenceController .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,6 +31,9 @@ import android.content.Context; import android.content.res.Resources; import android.provider.Settings; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,9 +44,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class SimulateColorSpacePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java index ad773d70d20..05edd14ee49 100644 --- a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -27,6 +28,8 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; @@ -40,8 +43,6 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class StayAwakePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java index f73ce463d42..3fceb1c7992 100644 --- a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -25,6 +26,9 @@ import android.os.StrictMode; import android.os.SystemProperties; import android.view.IWindowManager; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -35,9 +39,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class StrictModePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java index 832deb81a03..e44aeb46cec 100644 --- a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java @@ -17,12 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -32,9 +36,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class TetheringHardwareAccelPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java index 646057092bd..8bd43745a75 100644 --- a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java @@ -20,6 +20,7 @@ import static com.android.settings.development.TransitionAnimationScalePreferenc .DEFAULT_VALUE; import static com.android.settings.development.TransitionAnimationScalePreferenceController .TRANSITION_ANIMATION_SCALE_SELECTOR; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -28,6 +29,9 @@ import android.content.res.Resources; import android.os.RemoteException; import android.view.IWindowManager; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,9 +43,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class TransitionAnimationScalePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java index 7fd31c84cea..0c82bb46574 100644 --- a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java @@ -17,12 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -32,9 +36,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class UsbAudioRoutingPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java index cbee66e7484..fa04d69225f 100644 --- a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -30,6 +31,8 @@ import android.content.pm.ResolveInfo; import android.provider.Settings; import android.provider.Settings.Global; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedSwitchPreference; @@ -45,8 +48,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.Collections; import java.util.List; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class VerifyAppsOverUsbPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java index 4171267d76e..87d11350404 100644 --- a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java @@ -21,7 +21,9 @@ import static com.android.settings.development.DevelopmentOptionsActivityRequest import static com.android.settings.development.WaitForDebuggerPreferenceController .SETTING_VALUE_OFF; import static com.android.settings.development.WaitForDebuggerPreferenceController.SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -35,6 +37,9 @@ import android.content.Intent; import android.os.RemoteException; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -44,9 +49,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class WaitForDebuggerPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java index c68c2f2dd30..cc60b87845b 100644 --- a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java @@ -23,6 +23,9 @@ import static org.mockito.Mockito.when; import android.content.pm.PackageManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.webview.WebViewUpdateServiceWrapper; @@ -36,9 +39,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class WebViewAppPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java index dafa5f2e42b..e749ea64b3a 100644 --- a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java @@ -20,12 +20,17 @@ import static com.android.settings.development.WifiConnectedMacRandomizationPref .SETTING_VALUE_OFF; import static com.android.settings.development.WifiConnectedMacRandomizationPreferenceController .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -36,9 +41,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class WifiConnectedMacRandomizationPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java index cf03aed13cb..742bc7fe9ac 100644 --- a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java @@ -17,12 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -32,9 +36,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class WifiDisplayCertificationPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java index 72e87045434..daeff01ea63 100644 --- a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java @@ -22,6 +22,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.net.wifi.WifiManager; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -30,9 +33,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class WifiVerboseLoggingPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java index f0bb2ddb1a6..322eed78936 100644 --- a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java @@ -20,6 +20,7 @@ import static com.android.settings.development.WindowAnimationScalePreferenceCon .DEFAULT_VALUE; import static com.android.settings.development.WindowAnimationScalePreferenceController .WINDOW_ANIMATION_SCALE_SELECTOR; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -28,6 +29,9 @@ import android.content.res.Resources; import android.os.RemoteException; import android.view.IWindowManager; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,9 +43,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class WindowAnimationScalePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceControllerTest.java index b9da71d3f29..2e538e0fa79 100644 --- a/tests/robotests/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceControllerTest.java @@ -17,16 +17,19 @@ package com.android.settings.development.autofill; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; -import android.os.RemoteException; import android.view.autofill.AutofillManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -35,9 +38,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.ListPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class AutofillLoggingLevelPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceControllerTest.java index e560a836d38..f95cb35cd85 100644 --- a/tests/robotests/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development.autofill; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.verify; + import static org.mockito.Mockito.when; import android.content.Context; -import android.os.RemoteException; import android.view.autofill.AutofillManager; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -33,9 +35,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class AutofillResetOptionsPreferenceControllerTest { 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 c9c97538de1..24fe7336c12 100644 --- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.development.featureflags; import static com.android.settings.core.BasePreferenceController.AVAILABLE; + 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; @@ -25,6 +27,9 @@ import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -34,9 +39,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class FeatureFlagPreferenceControllerTest { 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 c42d46c246d..a6ff08842bd 100644 --- a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development.qstile; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -31,6 +32,10 @@ import android.content.pm.ServiceInfo; import android.os.RemoteException; import android.service.quicksettings.TileService; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.internal.statusbar.IStatusBarService; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -46,10 +51,6 @@ import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPackageManager; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class DevelopmentTilePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java index 8367fd3980e..c6ac4ae1c77 100644 --- a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java +++ b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java @@ -17,6 +17,7 @@ package com.android.settings.development.qstile; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java b/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java index 7644749daf0..636b067e17d 100644 --- a/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java +++ b/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java @@ -20,7 +20,9 @@ import static com.android.settings.development.qstile.DevelopmentTiles.WinscopeT .SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE; import static com.android.settings.development.qstile.DevelopmentTiles.WinscopeTrace .SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isNull; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java index b1073ac79a9..1560c51dd1e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java index 22344145fc9..d1d98eb9e0e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -32,6 +33,11 @@ import android.os.UserManager; import android.provider.Settings; import android.text.BidiFormatter; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -51,11 +57,6 @@ import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowUserManager; -import androidx.fragment.app.Fragment; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowUtils.class) public class BuildNumberPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java index 78eb0309740..e337141da25 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -25,6 +26,13 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.Build; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,13 +45,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; -import androidx.preference.Preference; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class DeviceModelPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java index 3ca06aa7705..4ee7f41c187 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.deviceinfo; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,6 +32,8 @@ import android.net.wifi.WifiManager; import android.os.Build; import android.provider.Settings; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.widget.ValidatedEditTextPreference; @@ -43,8 +47,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class DeviceNamePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java index c2163315b9d..2c2c2f28ff7 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java @@ -16,11 +16,15 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -30,9 +34,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class FccEquipmentIdPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java index 323a1165c0b..e84aa65ba93 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java @@ -16,11 +16,16 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -30,10 +35,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class FeedbackPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java index 23ca244d6f9..058bc764c94 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java @@ -26,6 +26,8 @@ import static org.mockito.Mockito.verify; import android.os.SystemProperties; import android.view.View; +import androidx.fragment.app.FragmentActivity; + import com.android.settings.R; import com.android.settings.testutils.Robolectric; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,8 +38,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.annotation.Config; -import androidx.fragment.app.FragmentActivity; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResourcesImpl.class) public class HardwareInfoDialogFragmentTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java index c269f712b44..7b1de47555d 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java index d1e8d98d6f1..4a741cffb6a 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -31,6 +32,9 @@ import android.os.Bundle; import android.telephony.TelephonyManager; import android.util.ArrayMap; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.PreferenceScreen; + import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -53,9 +57,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowConnectivityManager.class, ShadowUserManager.class}) public class MyDeviceInfoFragmentTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java index 08baa30de14..4748135a461 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.deviceinfo; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -28,6 +29,9 @@ import android.content.Context; import android.telephony.SubscriptionInfo; import android.telephony.TelephonyManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,9 +43,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class PhoneNumberPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java index 49025a8e20f..fad75c30fc3 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java @@ -23,6 +23,9 @@ import android.os.Bundle; import android.os.storage.VolumeRecord; import android.widget.Button; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.FragmentActivity; + import com.android.settings.R; import com.android.settings.deviceinfo.PrivateVolumeForget.ForgetConfirmFragment; import com.android.settings.testutils.Robolectric; @@ -36,9 +39,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.annotation.Config; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.FragmentActivity; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowStorageManager.class, SettingsShadowResourcesImpl.class}) public class PrivateVolumeForgetTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java index 56bc11ed80f..8ba455345ad 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java index eb1ac541780..24028d22ad8 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.when; @@ -25,6 +26,9 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -37,9 +41,6 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class RegulatoryInfoPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java index ca77a87d316..bd0eaf37fa0 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; @@ -30,6 +31,8 @@ import android.provider.SearchIndexableResource; import android.util.SparseArray; import android.view.View; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.deviceinfo.storage.CachedStorageValuesHelper; import com.android.settings.deviceinfo.storage.StorageAsyncLoader; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -44,8 +47,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.List; -import androidx.recyclerview.widget.RecyclerView; - @RunWith(SettingsRobolectricTestRunner.class) public class StorageDashboardFragmentTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java index 88ac8e9cbab..d42b40ff7d6 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java @@ -16,12 +16,15 @@ package com.android.settings.deviceinfo; import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES; + import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.view.LayoutInflater; import android.widget.ProgressBar; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -30,8 +33,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) public class StorageItemPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java index 440a6f58657..61fbf1f48d5 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java @@ -16,6 +16,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java index f50c725ac5a..3e7ce7a9313 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java @@ -16,9 +16,13 @@ package com.android.settings.deviceinfo.firmwareversion; -import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController.BASEBAND_PROPERTY; -import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController.BASEBAND_VERSION_LABEL_ID; -import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController.BASEBAND_VERSION_VALUE_ID; +import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController + .BASEBAND_PROPERTY; +import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController + .BASEBAND_VERSION_LABEL_ID; +import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController + .BASEBAND_VERSION_VALUE_ID; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.robolectric.shadow.api.Shadow.extract; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java index 2db2e6fb8f2..21388818eaf 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java @@ -16,7 +16,9 @@ package com.android.settings.deviceinfo.firmwareversion; -import static com.android.settings.deviceinfo.firmwareversion.BuildNumberDialogController.BUILD_NUMBER_VALUE_ID; +import static com.android.settings.deviceinfo.firmwareversion.BuildNumberDialogController + .BUILD_NUMBER_VALUE_ID; + import static org.mockito.Mockito.verify; import android.os.Build; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java index 6b4da5bd949..7b07db48628 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java @@ -16,8 +16,11 @@ package com.android.settings.deviceinfo.firmwareversion; -import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController.FIRMWARE_VERSION_LABEL_ID; -import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController.FIRMWARE_VERSION_VALUE_ID; +import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController + .FIRMWARE_VERSION_LABEL_ID; +import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController + .FIRMWARE_VERSION_VALUE_ID; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java index 512062cee5b..3927e202433 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java @@ -21,6 +21,11 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.os.Build; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,11 +41,6 @@ import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.annotation.Resetter; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class FirmwareVersionPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java index f47c07e61b1..24f4874dbe0 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java @@ -16,7 +16,9 @@ package com.android.settings.deviceinfo.firmwareversion; -import static com.android.settings.deviceinfo.firmwareversion.KernelVersionDialogController.KERNEL_VERSION_VALUE_ID; +import static com.android.settings.deviceinfo.firmwareversion.KernelVersionDialogController + .KERNEL_VERSION_VALUE_ID; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java index 7dc0014d7e8..8cb484eb69e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java @@ -16,8 +16,11 @@ package com.android.settings.deviceinfo.firmwareversion; -import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController.SECURITY_PATCH_LABEL_ID; -import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController.SECURITY_PATCH_VALUE_ID; +import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController + .SECURITY_PATCH_LABEL_ID; +import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController + .SECURITY_PATCH_VALUE_ID; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java index 349eddc717e..7213d12d118 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java @@ -23,6 +23,7 @@ import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_I import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_MEID_NUMBER_VALUE; import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_MIN_NUMBER_VALUE; import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_PRL_VERSION_VALUE; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java index d1056b58999..e633ea21478 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.deviceinfo.imei; import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA; import static android.telephony.TelephonyManager.PHONE_TYPE_GSM; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -29,6 +30,11 @@ import android.content.Context; import android.os.UserManager; import android.telephony.TelephonyManager; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -41,11 +47,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class ImeiInfoPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java index 1e836197af6..0547d5f34dd 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java @@ -15,6 +15,7 @@ package com.android.settings.deviceinfo.legal; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -28,6 +29,9 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -41,9 +45,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class CopyrightPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java index 16af0f38c2c..d4962e0b8ca 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java @@ -15,6 +15,7 @@ package com.android.settings.deviceinfo.legal; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -28,6 +29,9 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -41,9 +45,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class LicensePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java index 202f72b892c..7e4a92aaefc 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java @@ -15,6 +15,7 @@ package com.android.settings.deviceinfo.legal; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -28,6 +29,9 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -41,9 +45,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class TermsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java index 65b671626da..eff152011d6 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java @@ -15,6 +15,7 @@ package com.android.settings.deviceinfo.legal; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -28,6 +29,9 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -41,9 +45,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class WebViewLicensePreferenceControllerTest { 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 606fe075c08..649b6e2049a 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java @@ -45,6 +45,7 @@ import static com.android.settings.deviceinfo.simstatus.SimStatusDialogControlle .SIGNAL_STRENGTH_LABEL_ID; import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController .SIGNAL_STRENGTH_VALUE_ID; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -65,6 +66,8 @@ import android.telephony.SubscriptionInfo; import android.telephony.TelephonyManager; import android.telephony.euicc.EuiccManager; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -79,8 +82,6 @@ import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPackageManager; import org.robolectric.util.ReflectionHelpers; -import androidx.lifecycle.LifecycleOwner; - @RunWith(SettingsRobolectricTestRunner.class) public class SimStatusDialogControllerTest { 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 7846292c3b3..e814fc49c4d 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java @@ -27,6 +27,11 @@ import android.content.Context; import android.os.UserManager; import android.telephony.TelephonyManager; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,11 +44,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class SimStatusPreferenceControllerTest { 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 e206d521cee..4c767a2ae02 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo.storage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -30,6 +31,11 @@ import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.os.RoSystemProperties; import com.android.settings.core.BasePreferenceController; @@ -48,11 +54,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class AutomaticStorageManagementSwitchPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java index 9f5638847d2..5da2cb8b095 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java @@ -18,21 +18,28 @@ package com.android.settings.deviceinfo.storage; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.CACHE_APPS_SIZE_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_APP_BYTES; -import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_AUDIO_BYTES; -import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_IMAGE_BYTES; -import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_TOTAL_BYTES; -import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_VIDEO_BYTES; +import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper + .EXTERNAL_AUDIO_BYTES; +import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper + .EXTERNAL_IMAGE_BYTES; +import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper + .EXTERNAL_TOTAL_BYTES; +import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper + .EXTERNAL_VIDEO_BYTES; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.FREE_BYTES_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.GAME_APPS_SIZE_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.MUSIC_APPS_SIZE_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.OTHER_APPS_SIZE_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.PHOTO_APPS_SIZE_KEY; -import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.SHARED_PREFERENCES_NAME; +import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper + .SHARED_PREFERENCES_NAME; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.TIMESTAMP_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.TOTAL_BYTES_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.USER_ID_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.VIDEO_APPS_SIZE_KEY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java index cde850a337c..d525501c777 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.deviceinfo.storage; import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -29,6 +31,10 @@ import android.graphics.drawable.Drawable; import android.os.UserManager; import android.util.SparseArray; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource; import com.android.settingslib.core.AbstractPreferenceController; @@ -45,10 +51,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class SecondaryUserControllerTest { 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 4ec5f5fa1bc..0741d6d6248 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java @@ -19,7 +19,9 @@ import static com.android.settings.applications.manageapplications.ManageApplica import static com.android.settings.applications.manageapplications.ManageApplications .EXTRA_WORK_ONLY; import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.eq; @@ -38,6 +40,12 @@ import android.util.SparseArray; import android.view.LayoutInflater; import android.widget.LinearLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -61,12 +69,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class StorageItemPreferenceControllerTest { 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 df43c04793b..b51ae00549b 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.deviceinfo.storage; import static com.android.settings.TestUtils.GIGABYTE; import static com.android.settings.TestUtils.KILOBYTE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.spy; @@ -34,6 +36,8 @@ import android.view.View; import android.widget.Button; import android.widget.LinearLayout; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; @@ -52,8 +56,6 @@ import org.robolectric.annotation.Config; import java.io.File; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { SettingsShadowResources.class, 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 8595c542643..419aab50b1e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.deviceinfo.storage; import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -29,6 +31,9 @@ import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; import android.util.SparseArray; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.SettingsActivity; import com.android.settings.SubSettings; import com.android.settings.deviceinfo.StorageProfileFragment; @@ -44,9 +49,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class UserProfileControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java index 57de339ea1a..1e912ba2b29 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java @@ -1,6 +1,7 @@ package com.android.settings.deviceinfo.storage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java index 311c3f327b3..0c8bc7b7ab7 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java index 6428876a813..a8d5e19ab79 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.display; import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_AMBIENT_DISPLAY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -30,6 +32,8 @@ import android.content.Context; import android.os.UserHandle; import android.provider.Settings; +import androidx.preference.SwitchPreference; + import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; @@ -44,8 +48,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowSecureSettings.class) public class AmbientDisplayNotificationsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/display/AppGridViewTest.java b/tests/robotests/src/com/android/settings/display/AppGridViewTest.java index ac3435d4812..05226c359de 100644 --- a/tests/robotests/src/com/android/settings/display/AppGridViewTest.java +++ b/tests/robotests/src/com/android/settings/display/AppGridViewTest.java @@ -17,6 +17,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java index 5ceb70f2f86..6f667ae8c11 100644 --- a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java @@ -19,6 +19,7 @@ package com.android.settings.display; import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE; import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC; import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL; + import static com.google.common.truth.Truth.assertThat; import android.content.ContentResolver; diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java index 791922eaae2..e4db3ee1ac5 100644 --- a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; @@ -27,6 +28,8 @@ import android.content.pm.PackageManager; import android.os.UserHandle; import android.provider.Settings; +import androidx.preference.SwitchPreference; + import com.android.internal.view.RotationPolicy; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.FakeFeatureFactory; @@ -44,8 +47,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowSystemSettings.class) public class AutoRotatePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java index 140fc5cb222..708c9c1a177 100644 --- a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.display; import static android.provider.Settings.System.SHOW_BATTERY_PERCENT; + import static com.google.common.truth.Truth.assertThat; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java index 36190e8facb..4122b14b734 100644 --- a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.display; import static android.content.Context.POWER_SERVICE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.reset; @@ -30,6 +32,9 @@ import android.content.Context; import android.os.PowerManager; import android.provider.Settings.System; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -42,9 +47,6 @@ import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowContentResolver; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class BrightnessLevelPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java index 83343feb9e4..eddace14207 100644 --- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java @@ -17,12 +17,15 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.Preference; + import com.android.internal.app.ColorDisplayController; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,8 +37,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class ColorModePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java index 84d142c8f59..3aae145c55c 100644 --- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java @@ -16,6 +16,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; @@ -26,6 +27,10 @@ import static org.mockito.Mockito.when; import android.os.Bundle; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.app.ColorDisplayController; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; @@ -46,10 +51,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.List; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class ColorModePreferenceFragmentTest { diff --git a/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java index 21f3c0aa069..db33cbe93fb 100644 --- a/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java @@ -23,6 +23,9 @@ import static org.mockito.Mockito.when; import android.app.UiModeManager; import android.content.Context; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -32,9 +35,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class DarkUIPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java index 1a671402974..30dedb6a001 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java @@ -15,6 +15,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; @@ -22,6 +23,8 @@ import android.content.Context; import android.provider.Settings.Secure; import android.view.View; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -35,8 +38,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class NightDisplayActivationPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java index db811e08c93..a5b34498a90 100644 --- a/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java @@ -17,11 +17,14 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.SwitchPreference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -32,8 +35,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class ShowOperatorNamePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java index 19ffdc6d731..9d15ca06dfe 100644 --- a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -33,6 +34,8 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; +import androidx.preference.ListPreference; + import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -47,8 +50,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.Arrays; -import androidx.preference.ListPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class ThemePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java b/tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java index 40a59759999..a1d94fa7f9f 100644 --- a/tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java @@ -16,6 +16,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.robolectric.RuntimeEnvironment.application; diff --git a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java index a575a60c435..e0a504a9fdd 100644 --- a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.display; import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; diff --git a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java index 963bb145b2e..b7fb5edc412 100644 --- a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java +++ b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java index 89ca00aa974..8a24241d4f4 100644 --- a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java index 103cb534c41..a26997c135a 100644 --- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java +++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.dream; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java index 74847ee0ed6..d3244416d20 100644 --- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.dream; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java index 07f4a9d10e9..b9703e2176b 100644 --- a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java +++ b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.dream; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java index 2e547216dab..fc7edc2827c 100644 --- a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.dream; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,6 +25,8 @@ import android.content.Context; import android.view.View.OnClickListener; import android.widget.Button; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,8 +41,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class StartNowPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java index cf7c659bd9c..17c6cedab2b 100644 --- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java +++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.dream; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java index 96b0c83a1d3..e4f5cff1d76 100644 --- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java @@ -22,6 +22,8 @@ import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.dream.DreamBackend.WhenToDream; @@ -34,8 +36,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class WhenToDreamPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java index 33213d4ad98..1c47d914204 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java @@ -17,12 +17,15 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; import android.text.format.DateUtils; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; @@ -35,8 +38,6 @@ import org.mockito.MockitoAnnotations; import java.util.Date; import java.util.GregorianCalendar; -import androidx.preference.Preference; - /** * Common base for testing subclasses of {@link AdminActionPreferenceControllerBase}. */ diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java index d76fc91bd8b..2da6a88df74 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doAnswer; @@ -24,6 +25,8 @@ import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.testutils.FakeFeatureFactory; @@ -36,8 +39,6 @@ import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import androidx.preference.Preference; - /** * Common base for testing subclasses of {@link AdminGrantedPermissionsPreferenceControllerBase}. */ diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java index 574a050f81f..8c704fca781 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java @@ -17,10 +17,13 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -32,8 +35,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public final class AlwaysOnVpnCurrentUserPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java index eb45aa7f1c2..759edb37087 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java @@ -17,10 +17,13 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -31,8 +34,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class AlwaysOnVpnManagedProfilePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java index 26842042943..5c197926a27 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java @@ -17,13 +17,18 @@ package com.android.settings.enterprise; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.UserInfo; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.ApplicationFeatureProvider; @@ -41,9 +46,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class ApplicationListFragmentTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java index 750b46b8af2..833efd4d3dd 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.enterprise; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -33,6 +35,9 @@ import android.content.pm.PackageManager; import android.content.pm.UserInfo; import android.os.UserManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.applications.UserAppInfo; @@ -52,9 +57,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class ApplicationListPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java index bd8c77cc6c7..4e6db05cb87 100644 --- a/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java @@ -17,10 +17,13 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -29,8 +32,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class BackupsEnabledPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java index a3eeb712c4d..63c5981524b 100644 --- a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java index 2355e81492a..48bb0ce125e 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java @@ -17,8 +17,11 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -26,8 +29,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class CaCertsCurrentUserPreferenceControllerTest extends CaCertsPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java index 4ac28250992..47db2c7aec0 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java @@ -17,10 +17,13 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; @@ -30,8 +33,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.preference.Preference; - /** * Base test class for testing {@link CaCertsPreferenceControllerBase}'s subclass. */ diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java index 034293baf70..ac3ee27d8f2 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.anyObject; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.eq; @@ -24,6 +25,8 @@ import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.testutils.FakeFeatureFactory; @@ -38,8 +41,6 @@ import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class EnterpriseInstalledPackagesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java index 01365063f5a..a7bd3293ef4 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java index 0fcff3e1d48..dc5794c85da 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java @@ -17,10 +17,13 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -32,8 +35,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class EnterprisePrivacyPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java index 7bbe9bc1c12..d37738dfb15 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java index 70400dcea47..54559688401 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java @@ -17,11 +17,15 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,9 +40,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.List; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class EnterpriseSetDefaultAppsListFragmentTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java index c567f72fc96..2b3ed738dd7 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -33,6 +34,10 @@ import android.content.pm.UserInfo; import android.content.res.Resources; import android.os.UserHandle; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.EnterpriseDefaultApps; @@ -53,10 +58,6 @@ import org.robolectric.shadows.ShadowApplication; import java.util.Arrays; import java.util.Collections; -import androidx.preference.Preference; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class EnterpriseSetDefaultAppsListPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java index 4f73ea79a0a..eabd4bb7b6c 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.argThat; @@ -29,6 +30,8 @@ import android.content.pm.ApplicationInfo; import android.content.pm.UserInfo; import android.os.UserHandle; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.applications.EnterpriseDefaultApps; import com.android.settings.applications.UserAppInfo; @@ -46,8 +49,6 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public final class EnterpriseSetDefaultAppsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java index ba40752b34d..9dd02dea413 100644 --- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java @@ -17,10 +17,13 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; @@ -30,8 +33,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.preference.Preference; - /** * Common base for testing subclasses of {@link FailedPasswordWipePreferenceControllerBase}. */ diff --git a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java index 0a50ed66784..10e569a7a7e 100644 --- a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java @@ -17,10 +17,13 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -31,8 +34,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class GlobalHttpProxyPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java index 8fe73258b40..d62576065f5 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java @@ -17,10 +17,13 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -32,8 +35,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class ImePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java index e9066aa2900..661585326a1 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java @@ -17,12 +17,15 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -35,8 +38,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class ManageDeviceAdminPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java index 2201e69e4a4..56d90f56c76 100644 --- a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java index 2736d5610a6..00eb3f96487 100644 --- a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java b/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java index e7cae8edc2c..07296e652c5 100644 --- a/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java @@ -18,6 +18,7 @@ package com.android.settings.flashlight; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -26,6 +27,13 @@ import android.content.Context; import android.content.res.Resources; import android.provider.Settings; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.widget.SliceLiveData; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; @@ -37,13 +45,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.List; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.widget.SliceLiveData; - @RunWith(SettingsRobolectricTestRunner.class) public class FlashlightSliceBuilderTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java index e4868079524..b356c49de67 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java @@ -17,7 +17,9 @@ package com.android.settings.fuelgauge; import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -40,6 +42,11 @@ import android.os.BatteryStats; import android.os.Bundle; import android.os.UserHandle; +import androidx.fragment.app.FragmentActivity; +import androidx.loader.app.LoaderManager; +import androidx.preference.Preference; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; @@ -68,11 +75,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -import androidx.fragment.app.FragmentActivity; -import androidx.loader.app.LoaderManager; -import androidx.preference.Preference; -import androidx.recyclerview.widget.RecyclerView; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowEntityHeaderController.class, ShadowActivityManager.class}) public class AdvancedPowerUsageDetailTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java index 406ed772815..fcd483a8082 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java @@ -23,6 +23,8 @@ import static org.mockito.Mockito.doReturn; import android.content.Context; import android.provider.Settings; +import androidx.preference.SwitchPreference; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -33,8 +35,6 @@ import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class AutoRestrictionPreferenceControllerTest { private static final int ON = 1; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java index c29a012a292..2ef359b9378 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java @@ -26,6 +26,8 @@ import android.content.Context; import android.text.TextUtils; import android.text.format.DateUtils; +import androidx.preference.PreferenceGroup; + import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsImpl; import com.android.settings.R; @@ -41,8 +43,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceGroup; - @RunWith(SettingsRobolectricTestRunner.class) public class BatteryAppListPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java index 5bab7f4fc22..fb34640a803 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java @@ -16,7 +16,9 @@ package com.android.settings.fuelgauge; import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java index 491d71c8230..5541654bc53 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.fuelgauge; import static androidx.lifecycle.Lifecycle.Event.ON_START; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -34,6 +36,11 @@ import android.os.BatteryManager; import android.os.PowerManager; import android.widget.TextView; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceScreen; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.BasePreferenceController; @@ -55,11 +62,6 @@ import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowPowerManager; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.PreferenceScreen; -import androidx.recyclerview.widget.RecyclerView; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { SettingsShadowResources.class, diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java index d9e5bc0bc89..75f316f90a7 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java @@ -16,6 +16,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.spy; @@ -27,6 +28,8 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; @@ -40,8 +43,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) public class BatteryHistoryPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java index bebf31fabc7..dc5834ee9c0 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyLong; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java index 44486f80d46..ccc86a29fcf 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Matchers.anyLong; import static org.mockito.Mockito.any; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java index 3497e439639..364a63a33e4 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java @@ -16,6 +16,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java index d8ee8f61f95..afbb5b6c176 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java @@ -27,6 +27,9 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.content.Intent; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.dashboard.DashboardFragment; @@ -40,9 +43,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class BatteryOptimizationPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java index ac93941a7d0..7e887848c11 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java @@ -16,7 +16,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.doNothing; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -25,6 +25,8 @@ import android.content.Context; import android.os.PowerManager; import android.provider.Settings; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -35,8 +37,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class BatterySaverControllerTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java index b274492c75e..4cb7ff58b03 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java @@ -20,7 +20,9 @@ import static android.os.BatteryStats.Uid.PROCESS_STATE_FOREGROUND; import static android.os.BatteryStats.Uid.PROCESS_STATE_FOREGROUND_SERVICE; import static android.os.BatteryStats.Uid.PROCESS_STATE_TOP; import static android.os.BatteryStats.Uid.PROCESS_STATE_TOP_SLEEPING; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java index ef7bc9851d5..140a426b7e8 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java @@ -25,6 +25,8 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,8 +36,6 @@ import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) public class PowerGaugePreferenceTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java index af9566bf741..2f3cb7cf2a4 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java @@ -16,6 +16,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -31,6 +32,8 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; @@ -44,8 +47,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class PowerUsageAdvancedTest { @Mock diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java index 4b96a4d5452..012ebb2638c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java @@ -25,6 +25,8 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.os.Bundle; +import androidx.loader.app.LoaderManager; + import com.android.internal.os.BatteryStatsHelper; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowDashboardFragment; @@ -39,8 +41,6 @@ import org.robolectric.annotation.Config; import java.util.List; -import androidx.loader.app.LoaderManager; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowDashboardFragment.class) public class PowerUsageBaseTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java index 2dc4198574d..6d18109fb10 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java index 267f2635489..98031c92e72 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java @@ -32,6 +32,8 @@ import android.content.Intent; import android.os.UserHandle; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.fuelgauge.batterytip.AppInfo; @@ -48,8 +50,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class RestrictAppPreferenceControllerTest { private static final int ALLOWED_UID = 111; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java index 7219f183b60..f1e92e89ace 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -30,6 +31,11 @@ import android.os.UserHandle; import android.util.IconDrawableFactory; import android.util.SparseLongArray; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.CheckBoxPreference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceManager; + import com.android.settings.SettingsActivity; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper; @@ -57,11 +63,6 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -import androidx.appcompat.app.AlertDialog; -import androidx.preference.CheckBoxPreference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceManager; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class}) public class RestrictedAppDetailsTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java index 971de7a593b..96b1d7d810f 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java @@ -24,6 +24,8 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; +import androidx.preference.SwitchPreference; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,8 +36,6 @@ import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class SmartBatteryPreferenceControllerTest { 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 aa677f4141e..2bc5b14dd3f 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java @@ -22,6 +22,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; @@ -32,8 +34,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class AutoBatterySaverPreferenceControllerTest { 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 abf2cdc7825..5a92ce7ee2b 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java @@ -20,6 +20,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.widget.SeekBarPreference; @@ -32,8 +34,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.lifecycle.LifecycleOwner; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class AutoBatterySeekBarPreferenceControllerTest { 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 a4e8a7e75f4..c09af2b817d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterysaver; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -25,6 +26,8 @@ import android.content.Context; import android.os.PowerManager; import android.widget.Button; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.TwoStateButtonPreference; @@ -38,8 +41,6 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowPowerManager; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowPowerManager.class) public class BatterySaverButtonPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java index 4a2f5caa8ec..f600d41352d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip; import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java index ecba92c2d25..8e7590bbb2e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip; import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java index 1ebcc429ab6..8622e658c10 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java @@ -19,7 +19,9 @@ package com.android.settings.fuelgauge.batterytip; import static android.os.StatsDimensionsValue.FLOAT_VALUE_TYPE; import static android.os.StatsDimensionsValue.INT_VALUE_TYPE; import static android.os.StatsDimensionsValue.TUPLE_VALUE_TYPE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java index 5b6e2713ffe..4097e7cf6c4 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.fuelgauge.batterytip; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -23,6 +24,8 @@ import android.app.AppOpsManager; import android.content.Context; import android.provider.Settings; +import androidx.preference.Preference; + import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -33,8 +36,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class BatteryManagerPreferenceControllerTest { private static final int ON = 1; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java index 88821016244..98693003f20 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java @@ -17,12 +17,15 @@ package com.android.settings.fuelgauge.batterytip; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; import android.text.format.DateUtils; +import androidx.appcompat.app.AlertDialog; + import com.android.settings.R; import com.android.settings.fuelgauge.Estimate; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; @@ -48,8 +51,6 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -import androidx.appcompat.app.AlertDialog; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowUtils.class, ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class}) diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java index 3ada030de41..3485113ad8f 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java index e7aafef9792..afa8e4ec3ba 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.fuelgauge.batterytip; import static com.android.settings.fuelgauge.batterytip.tips.BatteryTip.TipType .SMART_BATTERY_MANAGER; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -28,6 +30,12 @@ import android.content.Context; import android.os.Bundle; import android.text.format.DateUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -49,12 +57,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class BatteryTipPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java index c4c3d021b18..24284efdd22 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip.detectors; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java index bcbcdff99c1..379d28f1e6c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip.detectors; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java index b5392bce463..657a5e326b0 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip.detectors; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetectorTest.java index 179f2a1586c..0133ecfd0ee 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetectorTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip.detectors; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java index 42d88224628..f10ea7ee601 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip.detectors; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.ContentResolver; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java index df38d34d48b..27cb04b3072 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip.detectors; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.text.format.DateUtils; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java index ec048aa6953..371bfb45796 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java @@ -21,6 +21,9 @@ import android.content.Context; import android.os.Parcel; import android.os.Parcelable; +import androidx.annotation.IdRes; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -33,9 +36,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -import androidx.annotation.IdRes; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class BatteryTipTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTipTest.java index f9e52d31b6e..752e3aba58b 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTipTest.java @@ -16,6 +16,7 @@ package com.android.settings.fuelgauge.batterytip.tips; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java index f0c202c92c1..1ff21f8c9ef 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java @@ -16,6 +16,7 @@ package com.android.settings.fuelgauge.batterytip.tips; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java index f623b9dc883..fe721133aea 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java @@ -16,6 +16,7 @@ package com.android.settings.fuelgauge.batterytip.tips; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java index dd3e281d09c..317e4266431 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java @@ -16,6 +16,7 @@ package com.android.settings.fuelgauge.batterytip.tips; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTipTest.java index 4ca87570d6b..221c37fcbc7 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTipTest.java @@ -16,6 +16,7 @@ package com.android.settings.fuelgauge.batterytip.tips; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java index 21b50477b16..59696abe0b3 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java index 9793f7d1576..9946361baff 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java index 459f5ef3381..7d8a88ed0cd 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java @@ -17,9 +17,11 @@ package com.android.settings.gestures; import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED; + import static com.android.settings.gestures.DoubleTapPowerPreferenceController.OFF; import static com.android.settings.gestures.DoubleTapPowerPreferenceController.ON; import static com.android.settings.gestures.DoubleTapPowerPreferenceController.isSuggestionComplete; + import static com.google.common.truth.Truth.assertThat; import android.content.ContentResolver; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java index 654d9b64f63..39792b49021 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.gestures; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java index 0ec5ae1d5b1..0fce4630076 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java index 61ac5adad48..7d1eab37864 100644 --- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; @@ -26,6 +27,10 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.Bundle; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.VideoPreference; @@ -37,10 +42,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; - @RunWith(SettingsRobolectricTestRunner.class) public class GesturePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java index 9d58693f303..d8f800d520b 100644 --- a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -26,6 +27,8 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -45,8 +48,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class GesturesSettingsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java index 17fa7cd308f..e889d41bd21 100644 --- a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java @@ -18,10 +18,10 @@ package com.android.settings.gestures; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java index a114719427c..9e83e052cea 100644 --- a/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java @@ -20,8 +20,11 @@ import static android.provider.Settings.Secure.VOLUME_HUSH_GESTURE; import static android.provider.Settings.Secure.VOLUME_HUSH_MUTE; import static android.provider.Settings.Secure.VOLUME_HUSH_OFF; import static android.provider.Settings.Secure.VOLUME_HUSH_VIBRATE; + import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java index d0a804f6497..65c3b5df5dc 100644 --- a/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java @@ -19,8 +19,11 @@ package com.android.settings.gestures; import static android.provider.Settings.Secure.VOLUME_HUSH_GESTURE; import static android.provider.Settings.Secure.VOLUME_HUSH_MUTE; import static android.provider.Settings.Secure.VOLUME_HUSH_OFF; + import static com.google.common.truth.Truth.assertThat; + import static junit.framework.Assert.assertEquals; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -28,6 +31,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -37,9 +43,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.preference.ListPreference; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class PreventRingingPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/gestures/ReachGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/ReachGesturePreferenceControllerTest.java index 9e24dab6261..78e899c5973 100644 --- a/tests/robotests/src/com/android/settings/gestures/ReachGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/ReachGesturePreferenceControllerTest.java @@ -25,10 +25,8 @@ import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; -import android.content.SharedPreferences; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl; import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -37,7 +35,6 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.RuntimeEnvironment; @RunWith(SettingsRobolectricTestRunner.class) public class ReachGesturePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java index 8522229b8eb..fefff22bff0 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.gestures; import static android.provider.Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/homepage/conditional/AbnormalRingerConditionControllerBaseTest.java b/tests/robotests/src/com/android/settings/homepage/conditional/AbnormalRingerConditionControllerBaseTest.java index 0b1772802be..9da13362db2 100644 --- a/tests/robotests/src/com/android/settings/homepage/conditional/AbnormalRingerConditionControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/homepage/conditional/AbnormalRingerConditionControllerBaseTest.java @@ -23,8 +23,6 @@ import android.content.Context; import android.content.Intent; import android.media.AudioManager; -import com.android.settings.homepage.conditional.AbnormalRingerConditionController; -import com.android.settings.homepage.conditional.ConditionManager; import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/homepage/conditional/BatterySaverConditionControllerTest.java b/tests/robotests/src/com/android/settings/homepage/conditional/BatterySaverConditionControllerTest.java index 9dd6780181d..bf99a776c12 100644 --- a/tests/robotests/src/com/android/settings/homepage/conditional/BatterySaverConditionControllerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/conditional/BatterySaverConditionControllerTest.java @@ -27,8 +27,6 @@ import android.content.IntentFilter; import android.os.PowerManager; import com.android.settings.fuelgauge.BatterySaverReceiver; -import com.android.settings.homepage.conditional.BatterySaverConditionController; -import com.android.settings.homepage.conditional.ConditionManager; import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/homepage/conditional/ConditionManagerTest.java b/tests/robotests/src/com/android/settings/homepage/conditional/ConditionManagerTest.java index f90c4489540..014a4a151fd 100644 --- a/tests/robotests/src/com/android/settings/homepage/conditional/ConditionManagerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/conditional/ConditionManagerTest.java @@ -24,10 +24,6 @@ import static org.mockito.Mockito.when; import android.content.Context; -import com.android.settings.homepage.conditional.ConditionListener; -import com.android.settings.homepage.conditional.ConditionManager; -import com.android.settings.homepage.conditional.ConditionalCard; -import com.android.settings.homepage.conditional.ConditionalCardController; import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/homepage/conditional/DndConditionalCardControllerTest.java b/tests/robotests/src/com/android/settings/homepage/conditional/DndConditionalCardControllerTest.java index c68f8999fc9..9fde60740f7 100644 --- a/tests/robotests/src/com/android/settings/homepage/conditional/DndConditionalCardControllerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/conditional/DndConditionalCardControllerTest.java @@ -24,8 +24,6 @@ import static org.mockito.Mockito.verify; import android.content.Context; -import com.android.settings.homepage.conditional.ConditionManager; -import com.android.settings.homepage.conditional.DndConditionCardController; import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/homepage/conditional/DndConditionalCardTest.java b/tests/robotests/src/com/android/settings/homepage/conditional/DndConditionalCardTest.java index 47a3010babc..b22c89ac051 100644 --- a/tests/robotests/src/com/android/settings/homepage/conditional/DndConditionalCardTest.java +++ b/tests/robotests/src/com/android/settings/homepage/conditional/DndConditionalCardTest.java @@ -24,9 +24,6 @@ import static org.mockito.Mockito.when; import android.content.Context; -import com.android.settings.homepage.conditional.ConditionManager; -import com.android.settings.homepage.conditional.DndConditionCard; -import com.android.settings.homepage.conditional.DndConditionCardController; import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java index e5ecd6d2423..b672e58967f 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java @@ -19,7 +19,9 @@ package com.android.settings.inputmethod; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java index 5621d04c6d6..cb3d6557113 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java @@ -17,12 +17,15 @@ package com.android.settings.inputmethod; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Intent; import android.os.Bundle; +import androidx.fragment.app.FragmentActivity; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -32,8 +35,6 @@ import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; -import androidx.fragment.app.FragmentActivity; - @RunWith(SettingsRobolectricTestRunner.class) public class InputMethodAndSubtypeEnablerTest { diff --git a/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java index 1d8d57da8a0..334ca4b90fd 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.inputmethod; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; @@ -26,6 +27,10 @@ import android.content.pm.ServiceInfo; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodSubtype; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowInputMethodManagerWithMethodList; @@ -41,10 +46,6 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowInputMethodManagerWithMethodList.class) public class InputMethodAndSubtypePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java index a2a8265943c..005471f184b 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.inputmethod; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Matchers.any; import static org.mockito.Mockito.never; @@ -29,6 +30,11 @@ import android.hardware.input.InputManager; import android.hardware.input.KeyboardLayout; import android.view.InputDevice; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowInputDevice; @@ -43,11 +49,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class KeyboardLayoutPickerControllerTest { diff --git a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java index d486644e044..18813e6d20c 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.inputmethod; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -26,6 +27,8 @@ import android.content.Context; import android.hardware.input.InputManager; import android.view.InputDevice; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowInputDevice; @@ -39,8 +42,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class PhysicalKeyboardPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java index fcd9c6e507e..5a1a93b8858 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.inputmethod; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -25,6 +26,8 @@ import android.content.res.Resources; import android.view.textservice.SpellCheckerInfo; import android.view.textservice.TextServicesManager; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,8 +39,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class SpellCheckerPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java index a2b6e876483..5c5042c1888 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.inputmethod; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -28,6 +29,10 @@ import android.database.MatrixCursor; import android.net.Uri; import android.provider.UserDictionary; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -39,10 +44,6 @@ import org.robolectric.shadows.ShadowContentResolver; import java.util.TreeSet; -import androidx.preference.Preference; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class UserDictionaryListControllerTest { diff --git a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java index 9ae36a2d6ab..43e89ffe05c 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.inputmethod; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -29,6 +30,9 @@ import android.content.pm.PackageManager; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; +import androidx.core.text.BidiFormatter; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -43,9 +47,6 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -import androidx.core.text.BidiFormatter; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class VirtualKeyboardPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java index a129c5568eb..43e8b18396a 100644 --- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java +++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.language; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -40,6 +41,8 @@ import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; import android.view.textservice.TextServicesManager; +import androidx.lifecycle.LifecycleObserver; + import com.android.settings.R; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -58,8 +61,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -import androidx.lifecycle.LifecycleObserver; - @RunWith(SettingsRobolectricTestRunner.class) public class LanguageAndInputSettingsTest { diff --git a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java index 5506b9941d0..83b29fcdb62 100644 --- a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.language; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,6 +25,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.AssetManager; +import androidx.preference.Preference; + import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,8 +41,6 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class PhoneLanguagePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java b/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java index 9d42088a6db..8101d404b42 100644 --- a/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.language; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java index 29b52787313..e1440b72605 100644 --- a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java @@ -20,6 +20,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.inputmethod.UserDictionaryList; import com.android.settings.inputmethod.UserDictionarySettings; import com.android.settings.testutils.FakeFeatureFactory; @@ -35,8 +37,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.TreeSet; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class UserDictionaryPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java index 908393ee078..6903bcd0c98 100644 --- a/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -23,6 +24,8 @@ import android.content.ContentResolver; import android.provider.Settings; import android.provider.Settings.Global; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -32,8 +35,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothScanningPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java index c9878bf715f..3302d2aae7b 100644 --- a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java @@ -16,7 +16,9 @@ package com.android.settings.location; import static android.Manifest.permission.WRITE_SECURE_SETTINGS; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; @@ -39,6 +41,8 @@ import android.os.UserManager; import android.provider.Settings; import android.text.TextUtils; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -57,8 +61,6 @@ import org.robolectric.annotation.Implements; import java.util.ArrayList; import java.util.List; -import androidx.lifecycle.LifecycleOwner; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { ShadowSecureSettings.class, diff --git a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java index 9991c3d9027..00d8adb2acd 100644 --- a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doNothing; @@ -37,6 +38,10 @@ import android.content.res.Resources; import android.location.LocationManager; import android.os.Bundle; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -51,10 +56,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; - @RunWith(SettingsRobolectricTestRunner.class) public class LocationFooterPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java index 80be34bfc67..58874be9a30 100644 --- a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; @@ -30,6 +31,9 @@ import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; @@ -47,9 +51,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class LocationForWorkPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java index c9717a6daf0..c12fdc90f7d 100644 --- a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.location; import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Mockito.verify; @@ -31,6 +33,10 @@ import android.content.IntentFilter; import android.location.LocationManager; import android.provider.Settings.Secure; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -42,10 +48,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class LocationPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java index f0904d03316..81e5f7c2426 100644 --- a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -31,6 +32,11 @@ import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.widget.RestrictedAppPreference; @@ -48,11 +54,6 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config( shadows = { diff --git a/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java b/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java index 18ef0079741..65b2e878d6a 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java @@ -1,6 +1,7 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -8,6 +9,14 @@ import static org.mockito.Mockito.spy; import android.content.Context; import android.content.res.Resources; +import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.widget.SliceLiveData; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; @@ -19,14 +28,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.List; -import androidx.core.graphics.drawable.IconCompat; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.widget.SliceLiveData; - @RunWith(SettingsRobolectricTestRunner.class) public class LocationSliceBuilderTest { diff --git a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java index 6f10c8565de..475cb831544 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java @@ -25,6 +25,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.ToggleSwitch; @@ -39,8 +41,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.lifecycle.LifecycleOwner; - @RunWith(SettingsRobolectricTestRunner.class) public class LocationSwitchBarControllerTest { diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java index 723659ae9f1..3d3dd28aa61 100644 --- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java @@ -16,7 +16,9 @@ package com.android.settings.location; import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.eq; @@ -32,6 +34,11 @@ import android.content.Intent; import android.provider.Settings; import android.text.TextUtils; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -54,11 +61,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class RecentLocationRequestPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java index 0cb7e7397f6..a012c51c591 100644 --- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java @@ -27,6 +27,10 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings.Secure; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.AppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -43,10 +47,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.Collections; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - /** Unit tests for {@link RecentLocationRequestSeeAllPreferenceController} */ @RunWith(SettingsRobolectricTestRunner.class) public class RecentLocationRequestSeeAllPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java index d0a3240fee7..fa0b64958a6 100644 --- a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -23,6 +24,8 @@ import android.content.ContentResolver; import android.provider.Settings; import android.provider.Settings.Global; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -32,8 +35,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class WifiScanningPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java b/tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java index 908e009b1eb..6d983816040 100644 --- a/tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java +++ b/tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java @@ -19,7 +19,9 @@ package com.android.settings.mobilenetwork; import static android.app.slice.Slice.EXTRA_TOGGLE_STATE; import static android.app.slice.Slice.HINT_TITLE; import static android.app.slice.SliceItem.FORMAT_TEXT; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; @@ -33,12 +35,20 @@ import android.content.Intent; import android.content.res.Resources; import android.telephony.CarrierConfigManager; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.core.SliceQuery; +import androidx.slice.widget.SliceLiveData; + import com.android.ims.ImsManager; import com.android.settings.R; +import com.android.settings.slices.CustomSliceManager; import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.slices.SliceBroadcastReceiver; import com.android.settings.slices.SlicesFeatureProvider; -import com.android.settings.slices.CustomSliceManager; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -52,14 +62,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.List; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.core.SliceQuery; -import androidx.slice.widget.SliceLiveData; - @RunWith(SettingsRobolectricTestRunner.class) public class Enhanced4gLteSliceHelperTest { diff --git a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java index 2d8514126e9..91a545c595d 100644 --- a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -27,6 +28,10 @@ import android.content.pm.PackageManager; import android.provider.Settings; import android.provider.SettingsSlicesContract; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -41,10 +46,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class AirplaneModePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java index 76d20f49bf0..69d86380ac6 100644 --- a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java +++ b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java @@ -17,6 +17,7 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -35,6 +36,12 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.EditTextPreference; +import androidx.preference.ListPreference; +import androidx.preference.MultiSelectListPreference; +import androidx.preference.SwitchPreference; + import com.android.settings.R; import com.android.settings.network.ApnEditor.ApnData; import com.android.settings.testutils.Robolectric; @@ -49,12 +56,6 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.EditTextPreference; -import androidx.preference.ListPreference; -import androidx.preference.MultiSelectListPreference; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class ApnEditorTest { diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java index 2941e902c6e..16872103bbe 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java @@ -15,6 +15,9 @@ */ package com.android.settings.network; +import static androidx.lifecycle.Lifecycle.Event.ON_START; +import static androidx.lifecycle.Lifecycle.Event.ON_STOP; + import static com.android.settings.network.MobileNetworkPreferenceController.MOBILE_NETWORK_CLASS; import static com.android.settings.network.MobileNetworkPreferenceController.MOBILE_NETWORK_PACKAGE; @@ -27,9 +30,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.robolectric.shadow.api.Shadow.extract; -import static androidx.lifecycle.Lifecycle.Event.ON_START; -import static androidx.lifecycle.Lifecycle.Event.ON_STOP; - import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -41,6 +41,10 @@ import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; import android.util.FeatureFlagUtils; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.FeatureFlags; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; @@ -58,10 +62,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { ShadowConnectivityManager.class, diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java index d6310ab3db3..d6f86f9e19d 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java @@ -16,6 +16,7 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java index 3a1833b2baf..8b0fe98568d 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java index 92994e01ee3..35431a09215 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java @@ -17,6 +17,7 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java index 728985143ec..7b940456c05 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -26,6 +27,8 @@ import android.content.Context; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,8 +42,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.Collections; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class NetworkScorerPickerPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java index e405891d5b0..83fa55cfe0a 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java @@ -16,6 +16,7 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; @@ -29,6 +30,9 @@ import android.content.Context; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.RadioButtonPreference; @@ -45,9 +49,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class NetworkScorerPickerTest { diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java index cb26fb607d8..2e3e819986c 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java @@ -20,7 +20,9 @@ import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF; import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC; import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME; import static android.provider.Settings.Global.PRIVATE_DNS_MODE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -35,6 +37,8 @@ import android.view.View; import android.widget.Button; import android.widget.LinearLayout; +import androidx.appcompat.app.AlertDialog; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowOs; @@ -48,8 +52,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -import androidx.appcompat.app.AlertDialog; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowOs.class) public class PrivateDnsModeDialogPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java index eb17bcbbee2..b475c7e9391 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java @@ -22,11 +22,15 @@ import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME import static android.provider.Settings.Global.PRIVATE_DNS_DEFAULT_MODE; import static android.provider.Settings.Global.PRIVATE_DNS_MODE; import static android.provider.Settings.Global.PRIVATE_DNS_SPECIFIER; + import static androidx.lifecycle.Lifecycle.Event.ON_START; import static androidx.lifecycle.Lifecycle.Event.ON_STOP; + import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.CALLS_REAL_METHODS; @@ -48,6 +52,10 @@ import android.net.Network; import android.os.Handler; import android.provider.Settings; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -59,8 +67,8 @@ import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowContentResolver; @@ -70,10 +78,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class PrivateDnsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java index c1cd8fbc053..e800cdd7638 100644 --- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java @@ -35,6 +35,8 @@ import android.database.ContentObserver; import android.net.ConnectivityManager; import android.provider.Settings; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -48,8 +50,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.concurrent.atomic.AtomicReference; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class TetherPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java index dc5aa9af9b9..11541ed2ab2 100644 --- a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.network; import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; @@ -34,6 +36,10 @@ import android.os.IBinder; import android.os.UserHandle; import android.provider.SettingsSlicesContract; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.net.VpnConfig; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -46,10 +52,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowServiceManager; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class VpnPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java index 71f94fd87cc..e3fc843a9b0 100644 --- a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.nfc; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -27,6 +28,8 @@ import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreference; @@ -42,8 +45,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class AndroidBeamPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java b/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java index 6bc4d3042bf..5caf0092712 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java @@ -24,6 +24,8 @@ import android.nfc.NfcAdapter; import android.provider.Settings; import android.provider.Settings.Global; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowNfcAdapter; @@ -35,8 +37,6 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowNfcAdapter.class}) public class NfcAirplaneModeObserverTest { diff --git a/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java index 1fc63cf24a2..cba70911892 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java @@ -17,6 +17,7 @@ package com.android.settings.nfc; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,6 +26,8 @@ import android.content.Context; import android.nfc.NfcAdapter; import android.provider.Settings; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -34,8 +37,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class NfcEnablerTest { diff --git a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java index b3e857f8662..113cb29bc0c 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.nfc; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,6 +25,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageManager; +import androidx.preference.DropDownPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,9 +40,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; -import androidx.preference.DropDownPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class NfcForegroundPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java index a23822f74b1..7db070d25ef 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.nfc; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,6 +25,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.nfc.PaymentBackend.PaymentAppInfo; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,8 +40,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class NfcPaymentPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java index 990900c4180..90a71e5e989 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.nfc; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -27,6 +28,9 @@ import android.nfc.NfcManager; import android.os.UserManager; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -40,9 +44,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class NfcPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java index 2700779f71f..b85bddad55e 100644 --- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java +++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java @@ -18,6 +18,7 @@ package com.android.settings.nfc; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java index 8cb22b3e7f5..6537a405c76 100644 --- a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doCallRealMethod; @@ -28,6 +29,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.settings.accounts.AccountRestrictionHelper; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; @@ -39,8 +42,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class AdjustVolumeRestrictedPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java index 4f48b779b6c..517c94b9fe7 100644 --- a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java index 2c7c4900677..a9df13569e2 100644 --- a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java @@ -20,8 +20,10 @@ import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -36,6 +38,9 @@ import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; @@ -49,9 +54,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class AllowSoundPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java index 9f411b16080..83c0b06b8ac 100644 --- a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java @@ -19,8 +19,10 @@ package com.android.settings.notification; import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -32,6 +34,8 @@ import android.content.Context; import android.content.Intent; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -42,8 +46,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class AppLinkPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java index 17a67140d83..dc368a254b6 100644 --- a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java @@ -21,8 +21,10 @@ import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.provider.Settings.Secure.NOTIFICATION_BADGING; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -38,6 +40,9 @@ import android.content.Context; import android.os.UserManager; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; @@ -51,9 +56,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class BadgePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java index 150a89f5cfe..72313bb5850 100644 --- a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java @@ -30,6 +30,10 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -40,10 +44,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; - @RunWith(SettingsRobolectricTestRunner.class) public class BadgingNotificationPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java index bdc7d69fe24..af53f23af3b 100644 --- a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java @@ -22,9 +22,11 @@ import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; diff --git a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java index ee01c8dc85e..0aa94c7c1ab 100644 --- a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java @@ -17,12 +17,16 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -33,9 +37,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.shadows.ShadowSystemProperties; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class BootSoundPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java index 61e5287391c..c3c0a33b0ef 100644 --- a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.notification; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java index 2796049154c..4d22bfe8e0f 100644 --- a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java @@ -26,6 +26,10 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Secure; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -36,10 +40,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class ChargingSoundPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java index f97172e3b7b..d3463ce770b 100644 --- a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java @@ -24,7 +24,9 @@ import static com.android.settings.notification.ConfigureNotificationSettings import static com.android.settings.notification.ConfigureNotificationSettings.KEY_SWIPE_DOWN; import static com.android.settings.notification.ConfigureNotificationSettings .SUMMARY_PROVIDER_FACTORY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java index c1428a4bfc9..35c7a1150bd 100644 --- a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java @@ -32,6 +32,8 @@ import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -42,8 +44,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.shadows.ShadowApplication; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class DeletedChannelsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java index 2d304cc67aa..0d82fcb6089 100644 --- a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java @@ -18,8 +18,10 @@ package com.android.settings.notification; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -31,6 +33,8 @@ import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -41,8 +45,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class DescriptionPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java index fe248a6e10a..8bc6d34fea3 100644 --- a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -25,6 +26,10 @@ import android.content.Context; import android.provider.Settings.System; import android.telephony.TelephonyManager; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -34,10 +39,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class DialPadTonePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java index 1b26a769b70..e086e7fc64f 100644 --- a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java @@ -20,8 +20,10 @@ import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_MIN; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -35,6 +37,9 @@ import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; @@ -48,9 +53,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class DndPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java index 7ddf1002c1e..7ad6230e196 100644 --- a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; @@ -26,6 +27,10 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.DropDownPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -35,10 +40,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.DropDownPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class DockAudioMediaPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java index 3945d27605a..a087cf20d28 100644 --- a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -25,6 +26,10 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -34,10 +39,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class DockingSoundPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java index 93273c86275..ef382111ce2 100644 --- a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.eq; diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java index f2687b2a0e9..5c71c643f46 100644 --- a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -25,6 +26,10 @@ import android.content.Context; import android.provider.Settings.Global; import android.telephony.TelephonyManager; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.DropDownPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -34,10 +39,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.DropDownPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class EmergencyTonePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java index 81383f7d11c..871aafb91d9 100644 --- a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java @@ -17,8 +17,10 @@ package com.android.settings.notification; import static android.app.NotificationManager.IMPORTANCE_NONE; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -32,6 +34,9 @@ import android.content.Context; import android.os.UserManager; import android.view.View; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.PreferenceFragmentCompat; + import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -42,9 +47,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.shadows.ShadowApplication; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.PreferenceFragmentCompat; - @RunWith(SettingsRobolectricTestRunner.class) public class HeaderPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java index bb7b05f7f58..0c706fbdaaf 100644 --- a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java @@ -20,10 +20,12 @@ import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; + import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -36,6 +38,9 @@ import android.content.Context; import android.os.UserManager; import android.text.TextUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.RestrictedListPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; @@ -49,9 +54,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class ImportancePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java index c9d6530a7a6..c2768259a32 100644 --- a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java @@ -21,8 +21,10 @@ import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -37,6 +39,9 @@ import android.content.Context; import android.os.UserManager; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settingslib.RestrictedLockUtils; @@ -52,9 +57,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class LightsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java index bd837036460..af810ace478 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -26,6 +27,9 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.Switch; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; @@ -35,9 +39,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) public class NotificationAppPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java index 9da6d727a1f..088fadee98e 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNull; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java index a245c808bf4..3c83c4e76b6 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java @@ -22,8 +22,10 @@ import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_MIN; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.any; @@ -38,6 +40,8 @@ import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; @@ -49,8 +53,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.shadows.ShadowApplication; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class NotificationPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java index 9d805e8785d..cd3fad71628 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java index d8ef938e423..65c60c7222b 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.notification; import static android.app.NotificationManager.IMPORTANCE_NONE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -28,6 +30,8 @@ import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -38,8 +42,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class NotificationsOffPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java index 98cbc76dc58..7a98386ea24 100644 --- a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java index b4f86a7c3fc..df1ee6fdf89 100644 --- a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java @@ -29,6 +29,10 @@ import android.content.Context; import android.content.res.Resources; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -40,10 +44,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; - @RunWith(SettingsRobolectricTestRunner.class) public class PulseNotificationPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java index 4c15769c90a..cbc51a99769 100644 --- a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -40,6 +41,12 @@ import android.os.UserManager; import android.service.notification.NotifyingApp; import android.text.TextUtils; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.AppUtils; @@ -60,12 +67,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class RecentNotifyingAppsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java b/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java index 20139bbfb11..5b337dea0a6 100644 --- a/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java +++ b/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java @@ -4,7 +4,9 @@ import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTI import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS; import static android.provider.Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS; import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS; + import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.Robolectric.buildActivity; import android.content.ContentResolver; diff --git a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java index 65bc7e6c40e..50a01bc89dc 100644 --- a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.app.NotificationManager; diff --git a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java index 6c4253f64d7..3bd32927895 100644 --- a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -24,6 +25,8 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.media.RingtoneManager; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -32,8 +35,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class RingtonePreferenceControllerBaseTest { diff --git a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java index f370368fb38..d3d4bc1b3df 100644 --- a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -25,6 +26,10 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.System; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -35,10 +40,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class ScreenLockSoundPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java index a70e7b665b3..6d51cde5687 100644 --- a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_GLOBAL; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -27,6 +29,9 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.PreferenceScreen; + import com.android.settings.SettingsPreferenceFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -41,9 +46,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class SettingPrefControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java index cbf01b1347e..3fc563a3a8e 100644 --- a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java @@ -20,8 +20,10 @@ import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -42,6 +44,9 @@ import android.os.UserManager; import android.provider.Settings; import android.util.AttributeSet; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.SettingsPreferenceFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; @@ -57,9 +62,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class SoundPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java index 3e0d0b419b5..3510a60eb1f 100644 --- a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java b/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java index 622d5cd8967..9bb380df01e 100644 --- a/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java +++ b/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java @@ -16,6 +16,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.ComponentName; diff --git a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java index 4d4a4af00be..abea4e30b9e 100644 --- a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java @@ -17,16 +17,20 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.media.AudioManager; import android.provider.Settings.System; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -37,10 +41,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class TouchSoundPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java index 5f96ea5e685..daf7ffb9e4d 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -25,6 +26,10 @@ import android.content.Context; import android.os.Vibrator; import android.provider.Settings.System; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -34,10 +39,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class VibrateOnTouchPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java index 91ee47e64ad..aa1824d7d53 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java @@ -17,9 +17,12 @@ package com.android.settings.notification; import static android.provider.Settings.System.VIBRATE_WHEN_RINGING; + import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -29,6 +32,10 @@ import android.content.Context; import android.provider.Settings; import android.telephony.TelephonyManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -40,10 +47,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowContentResolver; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; - @RunWith(SettingsRobolectricTestRunner.class) public class VibrateWhenRingPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java index 29b7049548e..69438e221ec 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java @@ -20,8 +20,10 @@ import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -36,6 +38,9 @@ import android.content.Context; import android.os.UserManager; import android.os.Vibrator; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; @@ -49,9 +54,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class VibrationPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java index fbc251206dc..d0e7b5a1847 100644 --- a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java @@ -23,8 +23,10 @@ import static android.app.NotificationManager.IMPORTANCE_MIN; import static android.app.NotificationManager.VISIBILITY_NO_OVERRIDE; import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS; import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java index d583d3710fd..99a97c342e2 100644 --- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -26,6 +27,9 @@ import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -34,9 +38,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class VolumeSeekBarPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java index 76f2b14d64f..4397e71c653 100644 --- a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -30,6 +31,11 @@ import android.os.UserHandle; import android.os.UserManager; import android.telephony.TelephonyManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + import com.android.settings.DefaultRingtonePreference; import com.android.settings.R; import com.android.settings.RingtonePreference; @@ -41,11 +47,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; - @RunWith(SettingsRobolectricTestRunner.class) public class WorkSoundPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java index 7f7be568ac5..c679205ee1e 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -25,6 +26,8 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.RadioButton; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -33,8 +36,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) public class ZenCustomRadioButtonPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java index 1360605eb9f..81ed5ef0bd4 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java @@ -25,7 +25,9 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -33,6 +35,8 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -46,8 +50,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class ZenFooterPreferenceControllerTest { private ZenFooterPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java index e68359aa3a4..7caccf2d2fc 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,6 +30,9 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -41,9 +45,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeAlarmsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java index 63b0e31fd6a..ec50e2b6a35 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static junit.framework.Assert.assertEquals; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -25,6 +26,10 @@ import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; +import androidx.fragment.app.Fragment; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -42,10 +47,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import androidx.fragment.app.Fragment; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeAutomaticRulesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java index b6cb3ee27dc..f1f1b2ea488 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java @@ -25,6 +25,8 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -37,8 +39,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public final class ZenModeBehaviorCallsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java index 79a36716496..4170ee89f19 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java @@ -21,7 +21,9 @@ import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_OFF; + import static junit.framework.Assert.assertTrue; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -36,6 +38,9 @@ import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig.ZenRule; import android.util.ArrayMap; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -50,9 +55,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeBehaviorFooterPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java index 15bc48aa5e0..11cdfcc2697 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java @@ -25,6 +25,8 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -37,8 +39,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public final class ZenModeBehaviorMsgEventReminderPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java index d4d214f5cab..c854e8ad357 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java @@ -25,6 +25,8 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -37,8 +39,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public final class ZenModeBehaviorSoundPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java index 9450df0ff62..67011740ea9 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java @@ -21,6 +21,7 @@ import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_OFF; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -32,6 +33,10 @@ import android.provider.Settings; import android.view.View; import android.widget.Button; +import androidx.fragment.app.FragmentManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -44,10 +49,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import androidx.fragment.app.FragmentManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeButtonPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java index 9ff5acb4f82..3093b6a0c0f 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,6 +30,9 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -42,9 +46,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeCallsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java index 36e61a42c2a..7d5efa7c065 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,6 +30,9 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -41,9 +45,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeEventsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java index afdfcf3afa7..f5eca34bf62 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,6 +30,9 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -42,9 +46,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeMediaPreferenceControllerTest { private ZenModeMediaPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java index c4aaa8c8e22..37ffd786118 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,6 +30,9 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -42,9 +46,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeMessagesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java index ece25e2661b..80e1e1ba878 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.notification; import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -29,6 +31,8 @@ import android.app.NotificationManager; import android.app.NotificationManager.Policy; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -40,8 +44,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class ZenModePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java index b009c3692ee..4ddb5fca455 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,6 +30,9 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -41,9 +45,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeRemindersPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java index eeef37c1691..4518427ad6c 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,6 +30,9 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -41,9 +45,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeRepeatCallersPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java index e955b2f1f5b..2596aa14f01 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -28,6 +29,8 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; +import androidx.fragment.app.FragmentActivity; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; @@ -41,8 +44,6 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowToast; -import androidx.fragment.app.FragmentActivity; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) public class ZenModeScheduleRuleSettingsTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java index aba4a3da929..b6efd78dda7 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java @@ -21,7 +21,9 @@ import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_OFF; + import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertFalse; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -38,6 +40,9 @@ import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig.ZenRule; import android.util.ArrayMap; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -51,9 +56,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeSettingsFooterPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java index 39e9271fa2f..96e56582995 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static junit.framework.Assert.assertEquals; import android.app.NotificationManager; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java index 8da0ba7b5e7..bfc5c428f05 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java @@ -17,7 +17,9 @@ package com.android.settings.notification; import static android.app.slice.Slice.EXTRA_TOGGLE_STATE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -28,6 +30,13 @@ import android.content.Intent; import android.content.res.Resources; import android.provider.Settings; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.widget.SliceLiveData; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; @@ -41,13 +50,6 @@ import org.robolectric.annotation.Config; import java.util.List; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.widget.SliceLiveData; - @Config(shadows = ShadowNotificationManager.class) @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeSliceBuilderTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java index ca3654462b8..c2ca9be131e 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.notification; import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_CALLS; import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; @@ -30,6 +32,9 @@ import android.content.Context; import android.content.Intent; import android.database.Cursor; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -45,9 +50,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeStarredContactsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java index 908f3bf1a28..418af7880b3 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,6 +30,9 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -41,9 +45,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeSystemPreferenceControllerTest { private ZenModeSystemPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java index 45573a90a6c..71720bfaffe 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_BADGE; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_LIGHTS; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_NOTIFICATION_LIST; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.eq; @@ -34,6 +35,8 @@ import android.app.NotificationManager; import android.content.Context; import android.content.res.Resources; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.DisabledCheckBoxPreference; @@ -47,8 +50,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeVisEffectPreferenceControllerTest { private ZenModeVisEffectPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java index cca7fd54187..3cada1ed793 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java @@ -25,8 +25,10 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR; + import static com.android.internal.logging.nano.MetricsProto.MetricsEvent .ACTION_ZEN_SOUND_AND_VIS_EFFECTS; + import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -36,6 +38,8 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -48,8 +52,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeVisEffectsAllPreferenceControllerTest { private ZenModeVisEffectsAllPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java index ae9a7bb5156..f3658823a43 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java @@ -25,7 +25,9 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -34,6 +36,8 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -46,8 +50,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeVisEffectsCustomPreferenceControllerTest { private ZenModeVisEffectsCustomPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java index 09dd3a0b7c8..08384af610a 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java @@ -25,7 +25,9 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR; + import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_ZEN_SOUND_ONLY; + import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; @@ -36,6 +38,8 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -48,8 +52,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeVisEffectsNonePreferenceControllerTest { private ZenModeVisEffectsNonePreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java b/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java index 5b031aacc78..833d8660960 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java @@ -19,11 +19,14 @@ package com.android.settings.notification; import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS; import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON; + import static com.android.settings.notification.ZenOnboardingActivity.ALWAYS_SHOW_THRESHOLD; import static com.android.settings.notification.ZenOnboardingActivity .PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME; import static com.android.settings.notification.ZenOnboardingActivity.isSuggestionComplete; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java index 3fe01b64ac8..ad530ba5ccb 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java index 369cb3c94e1..b8aaeb80382 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java @@ -28,12 +28,12 @@ import android.content.Context; import android.os.Bundle; import android.provider.Settings.Global; +import androidx.fragment.app.FragmentActivity; + import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; -import androidx.fragment.app.FragmentActivity; - import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java index c105ffe1867..fd44e4f1a36 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java @@ -17,6 +17,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.RuntimeEnvironment.application; import android.app.admin.DevicePolicyManager; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java index 17e684b57cc..cd99f36fae5 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java @@ -17,6 +17,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.RuntimeEnvironment.application; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java index 2a8c406551b..5d51178b65c 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java @@ -1,6 +1,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java index 5068f852cb1..76c9abadd6a 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -25,6 +26,9 @@ import static org.mockito.Mockito.verify; import android.content.Context; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; + import com.android.settings.R; import com.android.settings.password.ChooseLockTypeDialogFragment.OnLockTypeSelectedListener; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,9 +42,6 @@ import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {SettingsShadowResourcesImpl.class, ShadowAlertDialogCompat.class}) public class ChooseLockTypeDialogFragmentTest { diff --git a/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java index 1d0b71f834f..aa23005b80a 100644 --- a/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java +++ b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java @@ -18,6 +18,9 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; + import com.android.settings.password.ConfirmDeviceCredentialBaseFragment.LastTryDialog; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; @@ -27,9 +30,6 @@ import org.junit.runner.RunWith; import org.robolectric.Robolectric; import org.robolectric.annotation.Config; -import androidx.fragment.app.FragmentActivity; -import androidx.fragment.app.FragmentManager; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResourcesImpl.class) public class ConfirmCredentialTest { diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java index 97fb7775530..fa1c0f7ed91 100644 --- a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java +++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.password; import static android.content.pm.PackageManager.FEATURE_FACE; import static android.content.pm.PackageManager.FEATURE_FINGERPRINT; + import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment .HIDE_DISABLED_PREFS; import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment @@ -26,7 +27,9 @@ import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_C import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE; import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT; import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE; + import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java index 9acf73e844d..3802a83a2b2 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java @@ -17,6 +17,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.RuntimeEnvironment.application; import android.content.Intent; @@ -24,6 +25,8 @@ import android.os.Bundle; import android.view.View; import android.widget.Button; +import androidx.appcompat.app.AlertDialog; + import com.android.settings.R; import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment; import com.android.settings.password.ChooseLockPassword.IntentBuilder; @@ -48,8 +51,6 @@ import org.robolectric.shadows.ShadowDialog; import java.util.Collections; import java.util.List; -import androidx.appcompat.app.AlertDialog; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { SettingsShadowResources.class, diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java index d2ec78587ba..39e69d5c9a6 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java @@ -17,6 +17,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.RuntimeEnvironment.application; import android.content.ComponentName; @@ -25,6 +26,9 @@ import android.os.UserHandle; import android.view.View; import android.widget.Button; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.FragmentActivity; + import com.android.internal.widget.LockPatternView; import com.android.internal.widget.LockPatternView.Cell; import com.android.internal.widget.LockPatternView.DisplayMode; @@ -50,9 +54,6 @@ import org.robolectric.util.ReflectionHelpers.ClassParameter; import java.util.Arrays; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.FragmentActivity; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { SettingsShadowResourcesImpl.class, diff --git a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java index aa36b3367ef..5e46c8ca782 100644 --- a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java @@ -18,6 +18,9 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.FragmentActivity; + import com.android.settings.R; import com.android.settings.testutils.Robolectric; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -31,9 +34,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.annotation.Config; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.FragmentActivity; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { SettingsShadowResources.SettingsShadowTheme.class, diff --git a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java index 3828dbaae39..51988ff975e 100644 --- a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.print; import static androidx.lifecycle.Lifecycle.Event.ON_START; import static androidx.lifecycle.Lifecycle.Event.ON_STOP; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -31,6 +33,8 @@ import android.print.PrintJobInfo; import android.print.PrintManager; import android.printservice.PrintServiceInfo; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; @@ -48,8 +52,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -import androidx.lifecycle.LifecycleOwner; - @RunWith(SettingsRobolectricTestRunner.class) public class PrintSettingsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java index 0c507d9605d..0b3ea9cba96 100644 --- a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java +++ b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java @@ -17,6 +17,7 @@ package com.android.settings.search; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java b/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java index dc9472a392e..43ce96611d0 100644 --- a/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java @@ -29,6 +29,10 @@ import android.app.Activity; import android.content.ContentResolver; import android.net.Uri; +import androidx.slice.Slice; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceViewManager; + import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -41,10 +45,6 @@ import org.robolectric.Robolectric; import java.util.ArrayList; import java.util.List; -import androidx.slice.Slice; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceViewManager; - @RunWith(SettingsRobolectricTestRunner.class) public class DeviceIndexUpdateJobServiceTest { private static final Uri BASE_URI = new Uri.Builder() diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java index aae91835cb9..7b66a6b071b 100644 --- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java @@ -18,6 +18,7 @@ package com.android.settings.search; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.app.Activity; diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java index 971d4f59772..7cea11f61a5 100644 --- a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java @@ -17,8 +17,11 @@ package com.android.settings.search; import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE; + import static com.google.common.truth.Truth.assertThat; + import static junit.framework.Assert.fail; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java index 394d5f40b38..3ab4ab48602 100644 --- a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java +++ b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java @@ -29,9 +29,9 @@ import android.view.Menu; import android.view.MenuItem; import com.android.settings.R; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.ObservableFragment; import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java index 661f4967d55..ebe420512be 100644 --- a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java @@ -20,6 +20,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowKeyStore; @@ -30,8 +32,6 @@ import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowKeyStore.class) public class CredentialStoragePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java b/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java index 9d26de2e6d3..24e4e6245da 100644 --- a/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java +++ b/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java @@ -17,7 +17,9 @@ package com.android.settings.security; import static com.android.settings.security.EncryptionAndCredential.SEARCH_INDEX_DATA_PROVIDER; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; diff --git a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java index 7097f21c8ff..ee9fb16d1fa 100644 --- a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java @@ -20,11 +20,14 @@ import static com.android.settings.security.EncryptionStatusPreferenceController .PREF_KEY_ENCRYPTION_DETAIL_PAGE; import static com.android.settings.security.EncryptionStatusPreferenceController .PREF_KEY_ENCRYPTION_SECURITY_PAGE; + import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.os.UserManager; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; @@ -36,8 +39,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowLockPatternUtils.class) public class EncryptionStatusPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java index 53046c9ef59..f8d17a8f054 100644 --- a/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java @@ -24,6 +24,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,9 +39,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class LockUnificationPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java index a87d9dbce85..f0bda6e5503 100644 --- a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -23,6 +24,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.preference.SwitchPreference; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,8 +37,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class LockdownButtonPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java index e365bcbf083..7ec86113ae3 100644 --- a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -28,6 +29,12 @@ import static org.mockito.Mockito.when; import android.content.Context; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.users.OwnerInfoSettings; @@ -42,12 +49,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; -import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class OwnerInfoPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java index 9ef34d473ce..6bd5e1fc34d 100644 --- a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java @@ -21,6 +21,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.os.UserManager; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -32,8 +34,6 @@ import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.lifecycle.LifecycleOwner; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowUserManager.class) public class RestrictedEncryptionPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java index 1773540dd4b..1851ed52afb 100644 --- a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java @@ -22,6 +22,8 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -33,8 +35,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class ScreenPinningPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java index f9573ef5632..6b968e6f195 100644 --- a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -25,6 +26,9 @@ import android.content.Context; import android.os.UserHandle; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,9 +41,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class ShowPasswordPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java index 413932a4290..f20587db2ea 100644 --- a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.security; import static android.telephony.TelephonyManager.SIM_STATE_READY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -30,6 +32,9 @@ import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -44,9 +49,6 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class SimLockPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java index 1ee3fce6fb4..08fdd7d5e51 100644 --- a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java @@ -19,9 +19,12 @@ package com.android.settings.security; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; + import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -31,6 +34,8 @@ import android.content.pm.PackageManager; import android.hardware.fingerprint.FingerprintManager; import android.os.UserManager; +import androidx.lifecycle.LifecycleOwner; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -44,8 +49,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -import androidx.lifecycle.LifecycleOwner; - @RunWith(SettingsRobolectricTestRunner.class) public class VisiblePatternProfilePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java index c5e10e06bd4..8f05f74e96d 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.security.screenlock; import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java index b77b44ef5da..d89e6b0c8a0 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java @@ -18,10 +18,14 @@ package com.android.settings.security.screenlock; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; + import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE; import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; @@ -29,6 +33,10 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -42,10 +50,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class LockScreenPreferenceControllerTest { 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 68359907281..9d7a5071bf4 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java @@ -17,12 +17,15 @@ package com.android.settings.security.screenlock; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; import android.content.Context; +import androidx.preference.SwitchPreference; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -33,8 +36,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class PatternVisiblePreferenceControllerTest { 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 e3e25eaa58a..028145584d1 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java @@ -17,12 +17,15 @@ package com.android.settings.security.screenlock; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; import android.content.Context; +import androidx.preference.SwitchPreference; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.security.trustagent.TrustAgentManager; @@ -36,8 +39,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class PowerButtonInstantLockPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java b/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java index c1d7dd24791..6d378ef3d89 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.security.screenlock; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java index d6c4ce97331..07269bf6448 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java @@ -17,11 +17,14 @@ package com.android.settings.security.trustagent; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.Preference; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.security.trustagent.TrustAgentManager.TrustAgentComponentInfo; @@ -39,8 +42,6 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.Collections; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class ManageTrustAgentsPreferenceControllerTest { 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 6be834b8871..509fae4f328 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java @@ -20,7 +20,9 @@ import static com.android.settings.security.trustagent.TrustAgentListPreferenceC .PREF_KEY_SECURITY_CATEGORY; import static com.android.settings.security.trustagent.TrustAgentListPreferenceController .PREF_KEY_TRUST_AGENT; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; @@ -32,6 +34,11 @@ import android.app.Activity; import android.content.ComponentName; import android.content.Context; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.security.SecuritySettings; @@ -50,11 +57,6 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class TrustAgentListPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java index 9cee3d1f119..668734e14d2 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java @@ -17,6 +17,7 @@ package com.android.settings.security.trustagent; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.pm.PackageManager; diff --git a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentsPreferenceControllerTest.java index 43a80018cc5..f4d7a3212f1 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentsPreferenceControllerTest.java @@ -28,6 +28,9 @@ import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.service.trust.TrustAgentService; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; @@ -49,9 +52,6 @@ import org.robolectric.shadows.ShadowApplicationPackageManager; import java.util.ArrayList; import java.util.List; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { ShadowLockPatternUtils.class, diff --git a/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java index 6bccfe5f784..adcd184eec2 100644 --- a/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.shortcut; import static com.android.settings.shortcut.CreateShortcutPreferenceController.SHORTCUT_ID_PREFIX; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.eq; diff --git a/tests/robotests/src/com/android/settings/shortcut/ShortcutsUpdateTaskTest.java b/tests/robotests/src/com/android/settings/shortcut/ShortcutsUpdateTaskTest.java index 955e06979cc..4b40e477384 100644 --- a/tests/robotests/src/com/android/settings/shortcut/ShortcutsUpdateTaskTest.java +++ b/tests/robotests/src/com/android/settings/shortcut/ShortcutsUpdateTaskTest.java @@ -17,7 +17,9 @@ package com.android.settings.shortcut; import static com.android.settings.shortcut.CreateShortcutPreferenceController.SHORTCUT_ID_PREFIX; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java index b850e86ff52..1ee9230b50e 100644 --- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java +++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java @@ -18,7 +18,9 @@ package com.android.settings.slices; import static android.content.ContentResolver.SCHEME_CONTENT; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -37,6 +39,11 @@ import android.provider.Settings; import android.provider.SettingsSlicesContract; import android.util.ArraySet; +import androidx.slice.Slice; +import androidx.slice.SliceProvider; +import androidx.slice.widget.SliceLiveData; + +import com.android.settings.R; import com.android.settings.bluetooth.BluetoothSliceBuilder; import com.android.settings.flashlight.FlashlightSliceBuilder; import com.android.settings.location.LocationSliceBuilder; @@ -65,11 +72,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import androidx.slice.Slice; -import androidx.slice.SliceProvider; -import androidx.slice.widget.SliceLiveData; -import com.android.settings.R; - /** * TODO Investigate using ShadowContentResolver.registerProviderInternal(String, ContentProvider) */ diff --git a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java index 48489f9ba4b..705c0eb3dd5 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java @@ -17,6 +17,7 @@ package com.android.settings.slices; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; @@ -32,6 +33,13 @@ import android.provider.Settings; import android.provider.SettingsSlicesContract; import android.util.Pair; +import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.widget.SliceLiveData; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; @@ -48,13 +56,6 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.robolectric.RuntimeEnvironment; -import androidx.core.graphics.drawable.IconCompat; -import androidx.slice.Slice; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.widget.SliceLiveData; - @RunWith(SettingsRobolectricTestRunner.class) public class SliceBuilderUtilsTest { diff --git a/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java b/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java index 9c8b9462c92..213de11bf56 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java +++ b/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java @@ -17,6 +17,7 @@ package com.android.settings.slices; import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_CONTROLLER; + import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java index 66915ed83c8..a7df5a74028 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java @@ -17,6 +17,7 @@ package com.android.settings.slices; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/slices/SliceRelayReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceRelayReceiverTest.java index 3388a16f33f..5a47e1363c4 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceRelayReceiverTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceRelayReceiverTest.java @@ -25,12 +25,13 @@ import static org.mockito.Mockito.verify; import android.content.ContentResolver; import android.content.Context; - import android.content.Intent; import android.net.Uri; import android.provider.SettingsSlicesContract; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.SliceBroadcastRelay; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java index 1f314731f03..bea5e8933a3 100644 --- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java +++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java @@ -18,6 +18,7 @@ package com.android.settings.slices; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.ContentValues; diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java index 783ffa0c65c..602a7fd8217 100644 --- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java +++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java @@ -17,6 +17,7 @@ package com.android.settings.slices; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java index 7a2db3e43e0..b823105dd02 100644 --- a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java +++ b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java @@ -17,6 +17,7 @@ package com.android.settings.slices; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java b/tests/robotests/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java index f6557fc2d05..501c564782a 100644 --- a/tests/robotests/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java +++ b/tests/robotests/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java @@ -28,6 +28,8 @@ import android.content.IntentFilter; import android.net.Uri; import android.provider.SettingsSlicesContract; +import androidx.slice.Slice; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -35,8 +37,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.slice.Slice; - @RunWith(SettingsRobolectricTestRunner.class) public class SpecialCaseSliceManagerTest { diff --git a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java index 79864281840..1b5bdf8a918 100644 --- a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java @@ -19,9 +19,12 @@ package com.android.settings.sound; import static android.media.AudioSystem.DEVICE_OUT_ALL_SCO; import static android.media.AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_HEADSET; import static android.media.AudioSystem.STREAM_MUSIC; + import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -37,6 +40,10 @@ import android.content.IntentFilter; import android.content.pm.PackageManager; import android.util.FeatureFlagUtils; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.FeatureFlags; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -67,10 +74,6 @@ import org.robolectric.shadows.ShadowPackageManager; import java.util.ArrayList; import java.util.List; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { ShadowAudioManager.class, diff --git a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java index 47b6ea0a9a4..e2fc779e201 100644 --- a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.sound; import static android.media.AudioSystem.DEVICE_OUT_BLUETOOTH_SCO; import static android.media.AudioSystem.DEVICE_OUT_HEARING_AID; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -32,6 +34,10 @@ import android.bluetooth.BluetoothManager; import android.content.Context; import android.media.AudioManager; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAudioManager; @@ -56,10 +62,6 @@ import org.robolectric.shadows.ShadowBluetoothDevice; import java.util.ArrayList; import java.util.List; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { ShadowAudioManager.class, diff --git a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java index 85384379118..d2f5f1acc88 100644 --- a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java @@ -19,7 +19,9 @@ package com.android.settings.sound; import static android.media.AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP; import static android.media.AudioSystem.DEVICE_OUT_HEARING_AID; import static android.media.AudioSystem.DEVICE_OUT_REMOTE_SUBMIX; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -33,6 +35,10 @@ import android.bluetooth.BluetoothManager; import android.content.Context; import android.media.AudioManager; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAudioManager; @@ -57,10 +63,6 @@ import org.robolectric.shadows.ShadowBluetoothDevice; import java.util.ArrayList; import java.util.List; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { ShadowAudioManager.class, diff --git a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java index c7983d1666d..f49967a7be6 100644 --- a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java +++ b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java @@ -1,6 +1,7 @@ package com.android.settings.survey; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.never; @@ -12,6 +13,9 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.IntentFilter; +import androidx.fragment.app.FragmentActivity; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.overlay.SurveyFeatureProvider; import com.android.settings.testutils.FakeFeatureFactory; @@ -29,9 +33,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.HashMap; -import androidx.fragment.app.FragmentActivity; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; - @RunWith(SettingsRobolectricTestRunner.class) public class SurveyMixinTest { diff --git a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java index b65b2e3cd79..4245c96e450 100644 --- a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java @@ -20,7 +20,9 @@ import static android.os.SystemUpdateManager.KEY_TITLE; import static android.os.SystemUpdateManager.STATUS_IDLE; import static android.os.SystemUpdateManager.STATUS_UNKNOWN; import static android.os.SystemUpdateManager.STATUS_WAITING_DOWNLOAD; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; @@ -29,6 +31,9 @@ import android.os.Bundle; import android.os.SystemUpdateManager; import android.os.UserManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -47,9 +52,6 @@ import org.robolectric.shadows.ShadowUserManager; import java.util.ArrayList; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class SystemUpdatePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/testutils/FragmentController.java b/tests/robotests/src/com/android/settings/testutils/FragmentController.java index b3f7b6f47a0..63c68b11d1d 100644 --- a/tests/robotests/src/com/android/settings/testutils/FragmentController.java +++ b/tests/robotests/src/com/android/settings/testutils/FragmentController.java @@ -20,13 +20,13 @@ import android.content.Intent; import android.os.Bundle; import android.widget.LinearLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; + import org.robolectric.android.controller.ActivityController; import org.robolectric.android.controller.ComponentController; import org.robolectric.util.ReflectionHelpers; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; - /** * Controller class for driving fragment lifecycles, similar to {@link ActivityController}. */ diff --git a/tests/robotests/src/com/android/settings/testutils/ResIdSubject.java b/tests/robotests/src/com/android/settings/testutils/ResIdSubject.java index e85141c2510..3803d75c0ca 100644 --- a/tests/robotests/src/com/android/settings/testutils/ResIdSubject.java +++ b/tests/robotests/src/com/android/settings/testutils/ResIdSubject.java @@ -17,14 +17,15 @@ package com.android.settings.testutils; import static com.google.common.truth.Truth.assertAbout; + import static org.robolectric.RuntimeEnvironment.application; +import androidx.annotation.Nullable; + import com.google.common.truth.ComparableSubject; import com.google.common.truth.FailureStrategy; import com.google.common.truth.SubjectFactory; -import androidx.annotation.Nullable; - /** * Custom subject for use with {@link com.google.common.truth.Truth}, to provide a more readable * error message, so that instead of "Not true that 2130706432 equals to 17170444", it will say diff --git a/tests/robotests/src/com/android/settings/testutils/Robolectric.java b/tests/robotests/src/com/android/settings/testutils/Robolectric.java index 3020f329c56..549aad88e60 100644 --- a/tests/robotests/src/com/android/settings/testutils/Robolectric.java +++ b/tests/robotests/src/com/android/settings/testutils/Robolectric.java @@ -26,6 +26,9 @@ import android.os.Bundle; import android.util.AttributeSet; import android.view.View; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; + import org.robolectric.RuntimeEnvironment; import org.robolectric.android.XmlResourceParserImpl; import org.robolectric.android.controller.ActivityController; @@ -45,9 +48,6 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; - // TODO(b/111195450) - Duplicated from org.robolectric.Robolectric. @Deprecated public class Robolectric { diff --git a/tests/robotests/src/com/android/settings/testutils/SliceTester.java b/tests/robotests/src/com/android/settings/testutils/SliceTester.java index 195e4d6a273..af21dbac206 100644 --- a/tests/robotests/src/com/android/settings/testutils/SliceTester.java +++ b/tests/robotests/src/com/android/settings/testutils/SliceTester.java @@ -20,11 +20,21 @@ import static android.app.slice.Slice.HINT_TITLE; import static android.app.slice.Slice.SUBTYPE_COLOR; import static android.app.slice.SliceItem.FORMAT_INT; import static android.app.slice.SliceItem.FORMAT_TEXT; + import static com.google.common.truth.Truth.assertThat; import android.app.PendingIntent; import android.content.Context; +import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.builders.ListBuilder; +import androidx.slice.core.SliceAction; +import androidx.slice.core.SliceQuery; +import androidx.slice.widget.EventInfo; + import com.android.settings.Utils; import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.slices.SliceBuilderUtils; @@ -35,15 +45,6 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import androidx.core.graphics.drawable.IconCompat; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.builders.ListBuilder; -import androidx.slice.core.SliceAction; -import androidx.slice.core.SliceQuery; -import androidx.slice.widget.EventInfo; - /** * Testing utility class to verify the contents of the different Settings Slices. * 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 a441b281618..37b863574bc 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java @@ -1,6 +1,7 @@ package com.android.settings.testutils.shadow; import static android.util.TypedValue.TYPE_REFERENCE; + import static org.robolectric.RuntimeEnvironment.application; import static org.robolectric.shadow.api.Shadow.directlyOn; @@ -17,6 +18,10 @@ import android.util.AttributeSet; import android.util.SparseArray; import android.util.TypedValue; +import androidx.annotation.ArrayRes; +import androidx.annotation.ColorRes; +import androidx.annotation.Nullable; + import com.android.settings.R; import org.robolectric.RuntimeEnvironment; @@ -37,10 +42,6 @@ import org.w3c.dom.Node; import java.util.List; import java.util.Map; -import androidx.annotation.ArrayRes; -import androidx.annotation.ColorRes; -import androidx.annotation.Nullable; - /** * Shadow Resources and Theme classes to handle resource references that Robolectric shadows cannot * handle because they are too new or private. diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityWithLoadManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityWithLoadManager.java index 4a7301504db..a6d6babcb36 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityWithLoadManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityWithLoadManager.java @@ -18,12 +18,12 @@ package com.android.settings.testutils.shadow; import android.app.Activity; +import androidx.loader.app.LoaderManager; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.shadows.ShadowActivity; -import androidx.loader.app.LoaderManager; - /* * Shadow for {@link Activity} that has LoadManager accessors. */ diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAlertDialogCompat.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAlertDialogCompat.java index a682d85e2b1..e595cb6948b 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAlertDialogCompat.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAlertDialogCompat.java @@ -19,6 +19,8 @@ package com.android.settings.testutils.shadow; import android.annotation.SuppressLint; import android.view.View; +import androidx.appcompat.app.AlertDialog; + import org.robolectric.Shadows; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; @@ -30,8 +32,6 @@ import org.robolectric.util.ReflectionHelpers; import javax.annotation.Nullable; -import androidx.appcompat.app.AlertDialog; - /* Robolectric shadow for the androidx alert dialog. */ @Implements(AlertDialog.class) public class ShadowAlertDialogCompat extends ShadowDialog { diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java index bacd1fbfd97..bcf90c440fb 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java @@ -24,6 +24,7 @@ import static android.media.AudioManager.STREAM_NOTIFICATION; import static android.media.AudioManager.STREAM_RING; import static android.media.AudioManager.STREAM_SYSTEM; import static android.media.AudioManager.STREAM_VOICE_CALL; + import static org.robolectric.RuntimeEnvironment.application; import android.media.AudioDeviceCallback; 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 a17bdce8aa1..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,11 +16,11 @@ package com.android.settings.testutils.shadow; -import org.robolectric.annotation.Implements; - import androidx.core.text.BidiFormatter; import androidx.core.text.TextDirectionHeuristicCompat; +import org.robolectric.annotation.Implements; + @Implements(BidiFormatter.class) public class ShadowBidiFormatter { diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothDevice.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothDevice.java index 4cc77c3b072..a96f781dded 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothDevice.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothDevice.java @@ -17,6 +17,7 @@ package com.android.settings.testutils.shadow; import android.bluetooth.BluetoothDevice; + import org.robolectric.annotation.Implementation; 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 d9aaacc8e04..75526c85051 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java @@ -19,11 +19,11 @@ package com.android.settings.testutils.shadow; import android.content.Context; import android.util.AttributeSet; +import androidx.cardview.widget.CardView; + import org.robolectric.annotation.Implements; import org.robolectric.shadows.ShadowFrameLayout; -import androidx.cardview.widget.CardView; - /** * Shadow for CardView to get around view not implemented error. */ diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java index 2e96f8c2ce8..56f49794344 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java @@ -19,14 +19,14 @@ package com.android.settings.testutils.shadow; import android.app.Activity; import android.view.View; +import androidx.fragment.app.Fragment; + import com.android.settings.widget.EntityHeaderController; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.annotation.Resetter; -import androidx.fragment.app.Fragment; - @Implements(value = EntityHeaderController.class, callThroughByDefault = false) public class ShadowEntityHeaderController { 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 17129c287c8..e4be3185ea7 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java @@ -20,6 +20,8 @@ import android.content.Context; import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; +import androidx.annotation.NonNull; + import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; @@ -34,8 +36,6 @@ import java.util.List; import java.util.Map; import java.util.stream.IntStream; -import androidx.annotation.NonNull; - @Implements(FingerprintManager.class) public class ShadowFingerprintManager { diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java index 444ecabaf19..050b292cdb6 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java @@ -16,12 +16,12 @@ package com.android.settings.testutils.shadow; -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; +import org.robolectric.annotation.Implementation; +import org.robolectric.annotation.Implements; + /** * Override the {@link #setTargetFragment(Fragment, int)} to skip an illegal state exception * in SDK 26. SDK 26 requires that the target fragment be in the same {@link FragmentManager} as 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 efa4626f76f..35c6630ba47 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java @@ -20,6 +20,9 @@ import android.content.Context; import android.content.pm.PackageManager; import android.text.TextUtils; +import androidx.annotation.NonNull; +import androidx.core.content.PermissionChecker; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; @@ -27,9 +30,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -import androidx.annotation.NonNull; -import androidx.core.content.PermissionChecker; - /** * This class provides shadow for API that is not supported in current roboletric */ diff --git a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java index c2b1c9ff59e..0f95334d486 100644 --- a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -25,6 +26,8 @@ import android.content.Context; import android.content.pm.UserInfo; import android.provider.Settings.Global; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.RestrictedSwitchPreference; @@ -38,8 +41,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowUserManager.class}) public class AddUserWhenLockedPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java index cc19ad75ed0..04b314e2bd5 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; @@ -25,6 +26,11 @@ import android.content.DialogInterface; import android.content.pm.UserInfo; import android.os.UserManager; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -38,11 +44,6 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class AutoSyncDataPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java index c1f773de438..fb757017e82 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; @@ -24,6 +25,10 @@ import android.content.Context; import android.content.pm.UserInfo; import android.os.UserManager; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -36,10 +41,6 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class AutoSyncPersonalDataPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java index 1eda713ff8d..9e185f59184 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.when; @@ -26,6 +27,8 @@ import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; +import androidx.fragment.app.Fragment; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -37,8 +40,6 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.List; -import androidx.fragment.app.Fragment; - @RunWith(SettingsRobolectricTestRunner.class) public class AutoSyncWorkDataPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java b/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java index 2e205f86a96..caff2fad4f7 100644 --- a/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java @@ -19,11 +19,9 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -37,6 +35,9 @@ import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; + import com.android.settings.R; import com.android.settings.testutils.Robolectric; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -51,9 +52,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowUserManager.class}) public class EditUserInfoControllerTest { diff --git a/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java index f74de7a5452..94330a9124a 100644 --- a/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.users; import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE; import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; + import static com.google.common.truth.Truth.assertThat; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java index 2eeecaa4d4f..abdf4f513ff 100644 --- a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java @@ -17,6 +17,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java index ef8fae65344..ed79cf22ea9 100644 --- a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java index 76f9c5d09b6..41f48c6d01a 100644 --- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java +++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -31,6 +32,13 @@ import android.graphics.drawable.Drawable; import android.os.UserManager; import android.provider.Settings; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.testutils.Robolectric; @@ -46,13 +54,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class UserSettingsTest { diff --git a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java index da160fe4ea4..8736d75975e 100644 --- a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java @@ -21,6 +21,8 @@ import static org.mockito.Mockito.verify; import android.content.pm.PackageInfo; +import androidx.fragment.app.Fragment; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -29,8 +31,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.fragment.app.Fragment; - @RunWith(SettingsRobolectricTestRunner.class) public class AppDialogFragmentTest { diff --git a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java index fd41c3682ee..f8c08eaf27e 100644 --- a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java +++ b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java @@ -17,6 +17,7 @@ package com.android.settings.vpn2; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java index 57d77989496..686eb82faf6 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java @@ -17,7 +17,6 @@ package com.android.settings.wallpaper; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.when; import android.annotation.NonNull; import android.annotation.Nullable; @@ -29,7 +28,6 @@ import android.os.Handler; import com.android.settings.FallbackHome; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java index 9bebc934424..cf4a37f24b1 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java @@ -21,6 +21,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.content.Intent; +import androidx.preference.Preference; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -30,8 +32,6 @@ import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class WallpaperTypePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java index 7bc7e939529..73d6b4a50cb 100644 --- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java +++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java @@ -17,7 +17,9 @@ package com.android.settings.webview; import static android.provider.Settings.ACTION_WEBVIEW_SETTINGS; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -40,6 +42,8 @@ import android.content.pm.UserInfo; import android.os.UserManager; import android.webkit.UserPackage; +import androidx.fragment.app.FragmentActivity; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.applications.DefaultAppInfo; @@ -57,8 +61,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.Arrays; import java.util.Collections; -import androidx.fragment.app.FragmentActivity; - @RunWith(SettingsRobolectricTestRunner.class) public class WebViewAppPickerTest { diff --git a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java index a387d7870e0..3ae29d36bd6 100644 --- a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java +++ b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.wfd; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java index 3c7c95951a5..454813fb14f 100644 --- a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.widget; import static androidx.lifecycle.Lifecycle.Event.ON_START; import static androidx.lifecycle.Lifecycle.Event.ON_STOP; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -28,6 +30,9 @@ import android.app.ActionBar; import android.app.Activity; import android.view.View; +import androidx.lifecycle.LifecycleOwner; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -38,9 +43,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.lifecycle.LifecycleOwner; -import androidx.recyclerview.widget.RecyclerView; - @RunWith(SettingsRobolectricTestRunner.class) public class ActionBarShadowControllerTest { diff --git a/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java index a43f50006e3..a66f6d55ca0 100644 --- a/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; @@ -27,6 +28,8 @@ import android.content.Context; import android.view.View; import android.widget.Button; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -35,8 +38,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) public class ActionButtonPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java index e20520f3ea4..5b72a51e964 100644 --- a/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java @@ -22,6 +22,8 @@ import android.content.Context; import android.view.LayoutInflater; import android.view.View; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -30,8 +32,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) public class AppCheckBoxPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java index 4f9100aa2a6..c75d8fd463f 100644 --- a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java @@ -21,6 +21,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.view.View; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -29,8 +31,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) public class AppPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java index 8bca41dff96..ce366fe78de 100644 --- a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java @@ -21,6 +21,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.view.View; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -29,8 +31,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) public class AppSwitchPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java index b5c3d733320..02add358f97 100644 --- a/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -28,6 +29,10 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; +import androidx.preference.R; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -35,10 +40,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; -import androidx.preference.R; - @RunWith(SettingsRobolectricTestRunner.class) public class DisabledCheckBoxPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java index b458a3b6cca..ff93b7ee820 100644 --- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -40,6 +41,10 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -55,10 +60,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; -import androidx.preference.Preference; - @RunWith(SettingsRobolectricTestRunner.class) public class EntityHeaderControllerTest { diff --git a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java index 618de6382e3..3cbbbbec7d5 100644 --- a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java @@ -25,6 +25,8 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -34,8 +36,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) public class FixedLineSummaryPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java index 79854c50f10..79f344d9220 100644 --- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java +++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -31,6 +32,11 @@ import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.view.View; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; @@ -44,11 +50,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; -import androidx.preference.PreferenceViewHolder; -import androidx.recyclerview.widget.RecyclerView; - @RunWith(SettingsRobolectricTestRunner.class) public class HighlightablePreferenceGroupAdapterTest { diff --git a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java index 37d055e4576..07a0aa97ba1 100644 --- a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyLong; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java index 06fcc585489..e5cff2172a1 100644 --- a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -26,6 +27,9 @@ import android.view.View; import android.widget.CheckBox; import android.widget.LinearLayout; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,9 +38,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) public class MasterCheckBoxPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java index 062d1e4caf9..04b30892558 100644 --- a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -26,6 +27,9 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.Switch; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; @@ -35,9 +39,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) public class MasterSwitchPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java b/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java index 5895db25a70..92f75e99e3e 100644 --- a/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java index 3d415d458c2..64352d96638 100644 --- a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -26,6 +27,8 @@ import android.app.Activity; import android.content.Context; import android.os.UserManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.DefaultAppInfo; @@ -41,8 +44,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class RadioButtonPickerFragmentTest { diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java index 0d887795a67..5d914a2f273 100644 --- a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java @@ -17,13 +17,17 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static junit.framework.Assert.assertEquals; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.app.Application; import android.view.View; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -32,8 +36,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) public class RadioButtonPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java index 2e59b230e2b..7edfd0be636 100644 --- a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java +++ b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java @@ -23,6 +23,8 @@ import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; +import androidx.viewpager.widget.PagerAdapter; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -32,8 +34,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.Locale; -import androidx.viewpager.widget.PagerAdapter; - @RunWith(SettingsRobolectricTestRunner.class) public class RtlCompatibleViewPagerTest { diff --git a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java index 5c96361cfb2..20405ab6fac 100644 --- a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java +++ b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java index a7854122d81..ebfe74c3581 100644 --- a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java +++ b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.RuntimeEnvironment.application; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java index c88e7f87d00..e1c500211ea 100644 --- a/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java index bed2511cfbc..ae55217b699 100644 --- a/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java @@ -17,11 +17,14 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; import android.widget.ArrayAdapter; +import androidx.preference.ListPreference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; @@ -35,8 +38,6 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; -import androidx.preference.ListPreference; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowBluetoothUtils.class) public class UpdatableListPreferenceDialogFragmentTest { diff --git a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java index e5cb12d4405..80d25391494 100644 --- a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.never; @@ -30,6 +31,8 @@ import android.view.View; import android.widget.EditText; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -39,8 +42,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) public class ValidatedEditTextPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/VideoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/widget/VideoPreferenceControllerTest.java index ad56fe6692b..902b8ae8616 100644 --- a/tests/robotests/src/com/android/settings/widget/VideoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/VideoPreferenceControllerTest.java @@ -17,12 +17,15 @@ package com.android.settings.widget; import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE; + import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.anyBoolean; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.preference.PreferenceScreen; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,8 +34,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; - @RunWith(RobolectricTestRunner.class) public class VideoPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java index 3ba7c8ef13f..764de18929b 100644 --- a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -28,6 +29,8 @@ import android.media.MediaPlayer; import android.view.LayoutInflater; import android.view.TextureView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,8 +41,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) public class VideoPreferenceTest { private static final int VIDEO_WIDTH = 100; diff --git a/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java b/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java index fdfebcd598f..b65e5aefc0b 100644 --- a/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java +++ b/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java @@ -16,6 +16,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import android.Manifest; diff --git a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java index eb58452c60e..e12053cd4ac 100644 --- a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java b/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java index 012a76386de..6d8996068e4 100644 --- a/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java @@ -16,6 +16,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java index a0befc0e2de..be8eeae93d5 100644 --- a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java @@ -1,6 +1,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java index 16930c82278..452fe0346da 100644 --- a/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java index e07bcaf2d56..94f10ddd88b 100644 --- a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java @@ -24,6 +24,8 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.LinkifyUtils; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,8 +36,6 @@ import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceViewHolder; - @RunWith(SettingsRobolectricTestRunner.class) public class LinkablePreferenceTest { diff --git a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java index 7cd9b78b537..c9be0f6324e 100644 --- a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java @@ -17,13 +17,18 @@ package com.android.settings.wifi; import static android.provider.Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -33,9 +38,6 @@ import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class NotifyOpenNetworkPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java index b4b5b94e5d0..b44d8e2a0c6 100644 --- a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java @@ -18,9 +18,12 @@ package com.android.settings.wifi; import static android.content.Context.NETWORK_SCORE_SERVICE; import static android.provider.Settings.Global.USE_OPEN_WIFI_PACKAGE; + import static com.android.settings.wifi.UseOpenWifiPreferenceController .REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -35,6 +38,10 @@ import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; import android.provider.Settings; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -55,10 +62,6 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class UseOpenWifiPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java index 43e87d83050..5e8dd28ba1f 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyBoolean; import static org.mockito.Mockito.anyInt; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java index e80edba72a1..6535685b221 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java index c6ebafb9942..71a72981513 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java index d2e8cb8d5e7..6cbace92cf8 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.wifi; import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.verify; @@ -31,6 +33,10 @@ import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.provider.Settings; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -42,10 +48,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class WifiInfoPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java index f3919697a93..06d34794079 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -31,6 +32,9 @@ import android.net.NetworkScoreManager; import android.net.wifi.WifiManager; import android.os.Handler; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtils; @@ -45,9 +49,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowRestrictedLockUtils.class) public class WifiMasterSwitchPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java index d37b66768f8..e50d9ad1f0f 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java @@ -16,6 +16,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isNull; @@ -32,6 +33,9 @@ import android.content.Context; import android.content.DialogInterface; import android.provider.Settings; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; @@ -44,9 +48,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; - @RunWith(SettingsRobolectricTestRunner.class) public class WifiScanningRequiredFragmentTest { diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java index 01d97c1c059..e9daec325d2 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java @@ -21,7 +21,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import android.app.Activity; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java index b67e3b02c5e..dda5d8fc8f9 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java @@ -18,6 +18,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -27,6 +28,14 @@ import android.content.Intent; import android.content.res.Resources; import android.net.wifi.WifiManager; +import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.widget.SliceLiveData; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; @@ -38,14 +47,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.List; -import androidx.core.graphics.drawable.IconCompat; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.widget.SliceLiveData; - @RunWith(SettingsRobolectricTestRunner.class) public class WifiSliceTest { diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java index f55c57f8658..d40ead143be 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java index 308463b2bee..ffe1d8fe84d 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.wifi; import static android.provider.Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE; import static android.provider.Settings.Global.WIFI_WAKEUP_ENABLED; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -27,6 +29,9 @@ import android.content.Context; import android.location.LocationManager; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -40,9 +45,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class WifiWakeupPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java index 7e3ce6fac86..f393804ec14 100644 --- a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.app.Activity; diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java index 40a8510e165..7e8771188c7 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java @@ -19,6 +19,7 @@ package com.android.settings.wifi.calling; import static android.app.slice.Slice.EXTRA_TOGGLE_STATE; import static android.app.slice.Slice.HINT_TITLE; import static android.app.slice.SliceItem.FORMAT_TEXT; + import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -35,14 +36,25 @@ import android.content.Intent; import android.content.res.Resources; import android.telephony.CarrierConfigManager; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.core.SliceQuery; +import androidx.slice.widget.ListContent; +import androidx.slice.widget.RowContent; +import androidx.slice.widget.SliceContent; +import androidx.slice.widget.SliceLiveData; + import com.android.ims.ImsConfig; import com.android.ims.ImsManager; import com.android.settings.R; +import com.android.settings.slices.CustomSliceManager; import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.slices.SliceBroadcastReceiver; import com.android.settings.slices.SliceData; import com.android.settings.slices.SlicesFeatureProvider; -import com.android.settings.slices.CustomSliceManager; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -57,17 +69,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.core.SliceQuery; -import androidx.slice.widget.ListContent; -import androidx.slice.widget.SliceContent; -import androidx.slice.widget.RowContent; -import androidx.slice.widget.SliceLiveData; - @RunWith(SettingsRobolectricTestRunner.class) public class WifiCallingSliceHelperTest { 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 2bec044b9c0..59e6287e074 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.wifi.details; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; @@ -54,6 +55,11 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.ImageView; +import androidx.fragment.app.FragmentActivity; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; @@ -88,11 +94,6 @@ import java.net.UnknownHostException; import java.util.Arrays; import java.util.stream.Collectors; -import androidx.fragment.app.FragmentActivity; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { ShadowDevicePolicyManager.class, 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 f90b8e2c7d5..dd5dcc9a7b7 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java @@ -16,12 +16,15 @@ package com.android.settings.wifi.details; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; import android.net.wifi.WifiConfiguration; +import androidx.preference.DropDownPreference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -31,8 +34,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.robolectric.RuntimeEnvironment; -import androidx.preference.DropDownPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class WifiMeteredPreferenceControllerTest { 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 2b00adc11d5..8921311b760 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java @@ -17,12 +17,17 @@ package com.android.settings.wifi.p2p; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -32,10 +37,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class P2pCategoryPreferenceControllerTest { 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 4bc9028fda7..849c35acc88 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java @@ -17,11 +17,15 @@ package com.android.settings.wifi.p2p; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; import android.net.wifi.p2p.WifiP2pDevice; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -31,9 +35,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class P2pThisDevicePreferenceControllerTest { 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 e3be99251f7..75c5ffc2691 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.wifi.p2p; import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.times; @@ -30,6 +32,10 @@ import android.content.Intent; import android.content.IntentFilter; import android.net.wifi.WifiManager; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -40,10 +46,6 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class WifiP2PPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java b/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java index b6bf7e798da..fb7bef183ad 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java @@ -16,6 +16,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java index b556c8fa424..6faff11d011 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -28,6 +29,9 @@ import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,9 +42,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class WifiTetherApBandPreferenceControllerTest { 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 19f4edce048..519aa54e4a5 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java @@ -21,6 +21,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -29,8 +31,6 @@ import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.SwitchPreference; - @RunWith(SettingsRobolectricTestRunner.class) public class WifiTetherAutoOffPreferenceControllerTest { 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 5a09be6e08b..1b063d0ff86 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -27,6 +28,8 @@ import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.ValidatedEditTextPreference; @@ -38,8 +41,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class WifiTetherPasswordPreferenceControllerTest { 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 6352fc5ebdd..c81c490ed12 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -31,6 +32,9 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.provider.Settings; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.MasterSwitchPreference; @@ -48,9 +52,6 @@ import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.util.ReflectionHelpers; -import androidx.lifecycle.LifecycleOwner; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { WifiTetherPreferenceControllerTest.ShadowWifiTetherSettings.class, 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 bf70434bf1c..a9d4a43c4fe 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -27,6 +28,8 @@ import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.ValidatedEditTextPreference; @@ -38,8 +41,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class WifiTetherSSIDPreferenceControllerTest { 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 252de3842d0..f8131850fe3 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java @@ -1,6 +1,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -10,6 +11,9 @@ import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -19,9 +23,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class WifiTetherSecurityPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java index bf6c725e69d..d22776f647f 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt;