From 99cc23d0dab22f8c318d9103adb507955f458bf3 Mon Sep 17 00:00:00 2001 From: tmfang Date: Tue, 26 Jun 2018 19:01:57 +0800 Subject: [PATCH] Settings Fragment Migration (Change imports) This commit *only* changes imports and optimize imports. We don't do anything else. This patch can't compile pass and run test case. We will update other patches to fix these problem. Change list. 1. import android.app.Fragment; -> import androidx.fragment.app.Fragment; 2. import android.app.DialogFragment; -> import androidx.fragment.app.DialogFragment; 3. import android.app.ListFragment; -> import androidx.fragment.app.ListFragment; 4. import android.app.LoaderManager; -> import androidx.loader.app.LoaderManager; 5. import android.content.AsyncTaskLoader; -> import androidx.loader.content.AsyncTaskLoader; 6. import android.content.Loader; -> import androidx.loader.content.Loader; 7. import android.app.FragmentTransaction; -> import androidx.fragment.app.FragmentTransaction; 8. import android.app.FragmentManager; -> import androidx.fragment.app.FragmentManager; 9. import android.app.LoaderManager.LoaderCallbacks; -> import androidx.loader.app.LoaderManager.LoaderCallbacks; Bug: 110259478 Test: Can't test it. Change-Id: I0a3f98fff34a3494a839c3c42aeabcec3df2c8b3 --- .../settings/CustomListPreference.java | 5 ++- .../settings/RestrictedListPreference.java | 1 - .../android/settings/SettingsActivity.java | 18 +++++----- .../settings/SettingsLicenseActivity.java | 4 +-- .../settings/SettingsPreferenceFragment.java | 4 +-- .../settings/UserCredentialsSettings.java | 4 +-- src/com/android/settings/Utils.java | 2 +- ...ibilitySettingsForSetupWizardActivity.java | 1 - .../ColorInversionPreferenceController.java | 2 -- .../ShortcutServicePickerFragment.java | 3 +- .../AccountHeaderPreferenceController.java | 1 - .../accounts/AccountTypePreferenceLoader.java | 1 - .../RemoveAccountPreferenceController.java | 2 +- .../AppAndNotificationDashboardFragment.java | 3 +- .../settings/applications/AppInfoBase.java | 5 +-- .../applications/AppStorageSettings.java | 4 +-- .../RecentAppsPreferenceController.java | 2 +- .../applications/RunningServiceDetails.java | 3 +- .../AppBatteryPreferenceController.java | 4 +-- .../AppButtonsPreferenceController.java | 2 +- .../AppDataUsagePreferenceController.java | 4 +-- .../AppStoragePreferenceController.java | 4 +-- ...InstantAppButtonsPreferenceController.java | 2 +- .../applications/appops/AppOpsCategory.java | 9 ++--- .../appops/BackgroundCheckSummary.java | 3 +- .../defaultapps/DefaultAppPickerFragment.java | 5 +-- .../FileViewHolderController.java | 2 +- .../ManageApplications.java | 3 +- .../MusicViewHolderController.java | 2 +- .../PhotosViewHolderController.java | 2 +- .../deviceadmin/DeviceAdminAdd.java | 1 - .../backup/BackupSettingsActivity.java | 2 +- .../fingerprint/FingerprintSettings.java | 1 - .../SetupFingerprintEnrollFindSensor.java | 2 +- .../BluetoothDetailsButtonsController.java | 1 - .../bluetooth/BluetoothDetailsController.java | 1 - .../BluetoothDetailsHeaderController.java | 1 - .../BluetoothDetailsMacAddressController.java | 1 - .../BluetoothDetailsProfilesController.java | 1 - ...toothDeviceRenamePreferenceController.java | 2 +- .../SavedBluetoothDeviceUpdater.java | 2 +- .../settings/core/SubSettingLauncher.java | 2 +- .../settings/dashboard/DashboardSummary.java | 2 +- .../SuggestionFeatureProviderImpl.java | 2 +- .../settings/datausage/AppDataUsage.java | 4 +-- .../datausage/BillingCycleSettings.java | 2 +- .../settings/datausage/DataUsageList.java | 4 +-- .../timezone/model/TimeZoneDataLoader.java | 5 +-- .../ActivationWarningFragment.java | 3 +- ...aticStorageManagerSwitchBarController.java | 2 +- .../BluetoothA2dpHwOffloadRebootDialog.java | 3 +- .../ClearAdbKeysWarningDialog.java | 5 +-- .../DisableLogPersistWarningDialog.java | 5 +-- .../development/EnableAdbWarningDialog.java | 5 +-- ...EnableDevelopmentSettingWarningDialog.java | 3 +- .../EnableOemUnlockSettingWarningDialog.java | 5 +-- .../development/OemLockInfoDialog.java | 5 +-- .../featureflags/FeatureFlagPersistent.java | 1 - .../featureflags/FeatureFlagPreference.java | 1 - .../BuildNumberPreferenceController.java | 2 +- .../DeviceModelPreferenceController.java | 2 +- .../FeedbackPreferenceController.java | 2 +- .../deviceinfo/PrivateVolumeForget.java | 2 +- .../deviceinfo/PrivateVolumeSettings.java | 2 +- .../deviceinfo/StorageDashboardFragment.java | 4 +-- .../deviceinfo/StorageProfileFragment.java | 4 +-- .../settings/deviceinfo/StorageSettings.java | 2 +- .../aboutphone/DeviceNameWarningDialog.java | 3 +- .../FirmwareVersionDialogFragment.java | 5 +-- .../FirmwareVersionPreferenceController.java | 2 +- .../imei/ImeiInfoDialogFragment.java | 4 +-- .../imei/ImeiInfoPreferenceController.java | 2 +- .../simstatus/SimStatusDialogFragment.java | 5 +-- .../SimStatusPreferenceController.java | 2 +- ...eManagementSwitchPreferenceController.java | 2 +- .../StorageItemPreferenceController.java | 2 +- .../fuelgauge/AdvancedPowerUsageDetail.java | 4 +-- .../BatteryHeaderPreferenceController.java | 1 - .../settings/fuelgauge/HighPowerDetail.java | 3 +- .../settings/fuelgauge/PowerUsageBase.java | 4 +-- .../settings/fuelgauge/PowerUsageSummary.java | 6 ++-- .../actions/SmartBatteryAction.java | 4 +-- .../settings/homepage/HomepageFragment.java | 4 +-- ...tMethodAndSubtypePreferenceController.java | 1 - .../KeyboardLayoutDialogFragment.java | 7 ++-- .../KeyboardLayoutPickerController.java | 2 +- .../inputmethod/UserDictionarySettings.java | 7 ++-- .../UserDictionaryPreferenceController.java | 2 +- .../localepicker/LocaleListEditor.java | 2 +- .../AirplaneModePreferenceController.java | 2 +- .../network/NetworkDashboardFragment.java | 2 +- ...ModeAutomaticRulePreferenceController.java | 2 +- .../ConfigureNotificationSettings.java | 2 +- .../HeaderPreferenceController.java | 1 - .../NotificationAccessSettings.java | 3 +- ...centNotifyingAppsPreferenceController.java | 2 +- .../WorkSoundPreferenceController.java | 2 +- ...tomaticRuleHeaderPreferenceController.java | 3 +- ...tomaticRuleSwitchPreferenceController.java | 2 +- .../notification/ZenDeleteRuleDialog.java | 3 +- ...eAddAutomaticRulePreferenceController.java | 2 +- ...odeAutomaticRulesPreferenceController.java | 2 +- .../ZenModeAutomationSettings.java | 3 +- .../ZenModeButtonPreferenceController.java | 2 +- .../ZenModeDurationPreferenceController.java | 2 +- .../ZenModeScheduleRuleSettings.java | 2 +- .../notification/ZenModeSettings.java | 2 +- .../notification/ZenRuleNameDialog.java | 3 +- .../notification/ZenRulePreference.java | 2 +- .../notification/ZenRuleSelectionDialog.java | 3 +- .../settings/password/ChooseLockGeneric.java | 5 ++- .../settings/password/ChooseLockPassword.java | 2 +- .../settings/password/ChooseLockPattern.java | 3 +- .../password/ChooseLockSettingsHelper.java | 3 +- .../ChooseLockTypeDialogFragment.java | 3 +- .../ConfirmDeviceCredentialBaseActivity.java | 3 +- .../ConfirmDeviceCredentialBaseFragment.java | 7 ++-- .../password/ConfirmLockPassword.java | 3 +- .../CredentialCheckResultTracker.java | 3 +- .../password/SaveChosenLockWorkerBase.java | 3 +- .../password/SetupChooseLockGeneric.java | 1 - .../password/SetupChooseLockPassword.java | 2 +- .../password/SetupChooseLockPattern.java | 2 +- .../settings/password/SetupSkipDialog.java | 2 +- .../print/PrintServiceSettingsFragment.java | 5 +-- .../settings/print/PrintSettingsFragment.java | 6 ++-- .../actionbar/SearchMenuController.java | 3 +- .../OwnerInfoPreferenceController.java | 2 +- .../UnificationConfirmationDialog.java | 3 +- .../LockAfterTimeoutPreferenceController.java | 2 +- .../screenlock/ScreenLockSettings.java | 3 +- .../support/actionbar/HelpMenuController.java | 3 +- .../android/settings/survey/SurveyMixin.java | 3 +- .../AutoSyncDataPreferenceController.java | 2 +- ...oSyncPersonalDataPreferenceController.java | 3 +- .../AutoSyncWorkDataPreferenceController.java | 3 +- .../users/EditUserInfoController.java | 3 +- .../users/EditUserPhotoController.java | 2 +- .../settings/users/OwnerInfoSettings.java | 3 +- .../utils/ManagedServiceSettings.java | 2 +- .../settings/vpn2/AppDialogFragment.java | 3 +- .../settings/vpn2/AppManagementFragment.java | 2 +- .../vpn2/ConfirmLockdownFragment.java | 3 +- .../widget/EntityHeaderController.java | 2 +- .../wifi/LongPressAccessPointPreference.java | 2 +- .../wifi/UseOpenWifiPreferenceController.java | 2 +- .../settings/wifi/WifiPickerActivity.java | 2 -- .../settings/wifi/WifiScanModeActivity.java | 3 +- .../wifi/WifiWakeupPreferenceController.java | 2 +- .../wifi/calling/WifiCallingSettings.java | 4 +-- .../WifiDetailPreferenceController.java | 2 +- .../anomaly/tester/AnomalyActivity.java | 1 - .../android/settings/HelpTrampolineTest.java | 1 - .../com/android/settings/MasterClearTest.java | 2 -- .../RestrictedListPreferenceTest.java | 1 - .../settings/SettingsActivityTest.java | 5 +-- .../settings/SettingsDialogFragmentTest.java | 3 +- .../settings/SettingsLicenseActivityTest.java | 1 - ...olorInversionPreferenceControllerTest.java | 1 - .../AccountDetailDashboardFragmentTest.java | 1 - ...AccountHeaderPreferenceControllerTest.java | 1 - .../AccountTypePreferenceLoaderTest.java | 1 - ...RemoveAccountPreferenceControllerTest.java | 5 ++- .../AppBatteryPreferenceControllerTest.java | 2 +- .../AppButtonsPreferenceControllerTest.java | 3 +- .../AppDataUsagePreferenceControllerTest.java | 2 +- ...AppHeaderViewPreferenceControllerTest.java | 1 - .../AppSettingPreferenceControllerTest.java | 1 - .../AppStoragePreferenceControllerTest.java | 2 +- .../ButtonActionDialogFragmentTest.java | 4 +-- .../InstantAppButtonDialogFragmentTest.java | 1 - ...antAppButtonsPreferenceControllerTest.java | 4 +-- .../MusicViewHolderControllerTest.java | 3 +- .../PhotosViewHolderControllerTest.java | 3 +- .../backup/BackupSettingsActivityTest.java | 8 ++--- .../FaceStatusPreferenceControllerTest.java | 2 -- ...BluetoothDetailsButtonsControllerTest.java | 5 +-- .../BluetoothDetailsControllerEventsTest.java | 1 - .../BluetoothDetailsHeaderControllerTest.java | 7 ++-- ...hDeviceRenamePreferenceControllerTest.java | 4 +-- .../BluetoothPairingControllerTest.java | 1 - .../ForgetDeviceDialogFragmentTest.java | 1 - ...AdvancedConnectedDeviceControllerTest.java | 1 - .../UsbConnectionBroadcastReceiverTest.java | 1 - .../UsbDetailsPowerRoleControllerTest.java | 11 +++---- .../settings/core/SubSettingLauncherTest.java | 3 +- .../InstrumentableFragmentCodeInspector.java | 3 +- .../DashboardFeatureProviderImplTest.java | 8 +++-- ...dFragmentSearchIndexProviderInspector.java | 3 +- .../BackgroundDataConditionTest.java | 1 - .../timezone/RegionSearchPickerTest.java | 3 +- .../timezone/model/TimeZoneDataTest.java | 8 ++--- ...StorageManagerSwitchBarControllerTest.java | 4 +-- .../ClearAdbKeysPreferenceControllerTest.java | 2 +- .../OemUnlockPreferenceControllerTest.java | 2 +- .../FeatureFlagPersistentTest.java | 14 +++----- .../qstile/DevelopmentTilesTest.java | 1 - .../BuildNumberPreferenceControllerTest.java | 2 +- .../DeviceModelPreferenceControllerTest.java | 6 ++-- .../FeedbackPreferenceControllerTest.java | 2 +- .../deviceinfo/PrivateVolumeFormatTest.java | 1 - ...rmwareVersionPreferenceControllerTest.java | 2 +- .../ImeiInfoPreferenceControllerTest.java | 4 +-- .../SimStatusPreferenceControllerTest.java | 4 +-- ...agementSwitchPreferenceControllerTest.java | 4 +-- .../StorageItemPreferenceControllerTest.java | 6 ++-- .../DarkUIPreferenceControllerTest.java | 2 -- .../display/TimeoutListPreferenceTest.java | 2 -- .../TimeoutPreferenceControllerTest.java | 1 - .../AdvancedPowerUsageDetailTest.java | 2 +- ...BatteryHeaderPreferenceControllerTest.java | 2 -- .../fuelgauge/PowerUsageBaseTest.java | 3 +- .../fuelgauge/PowerUsageSummaryTest.java | 3 +- .../fuelgauge/RestrictedAppDetailsTest.java | 1 - .../anomaly/AnomalyDialogFragmentTest.java | 1 - ...nomalySummaryPreferenceControllerTest.java | 4 +-- .../BatteryTipDialogFragmentTest.java | 1 - .../actions/RestrictAppActionTest.java | 3 -- .../actions/UnrestrictAppActionTest.java | 2 -- .../detectors/HighUsageDetectorTest.java | 2 -- .../detectors/LowBatteryDetectorTest.java | 1 - .../detectors/RestrictAppDetectorTest.java | 1 - .../batterytip/tips/BatteryTipTest.java | 5 +-- .../batterytip/tips/EarlyWarningTipTest.java | 1 - .../batterytip/tips/HighUsageTipTest.java | 1 - .../batterytip/tips/LowBatteryTipTest.java | 2 -- .../batterytip/tips/RestrictAppTipTest.java | 2 -- .../batterytip/tips/SummaryTipTest.java | 1 - ...hodAndSubtypePreferenceControllerTest.java | 1 - .../KeyboardLayoutPickerControllerTest.java | 2 +- .../ConfigureNotificationSettingsTest.java | 1 - .../HeaderPreferenceControllerTest.java | 2 -- ...NotifyingAppsPreferenceControllerTest.java | 2 +- ...utomaticRulesPreferenceControllerTest.java | 2 +- ...ZenModeButtonPreferenceControllerTest.java | 2 +- ...nModeDurationPreferenceControllerTest.java | 2 +- .../ChooseLockTypeDialogFragmentTest.java | 3 +- .../password/ConfirmCredentialTest.java | 3 +- .../password/SetNewPasswordActivityTest.java | 1 - .../password/SetupChooseLockPasswordTest.java | 1 - .../password/SetupSkipDialogTest.java | 1 - .../OwnerInfoPreferenceControllerTest.java | 5 ++- ...oOutputSwitchPreferenceControllerTest.java | 1 - .../shadow/SettingsShadowResources.java | 1 - .../shadow/ShadowActivityWithLoadManager.java | 3 +- .../shadow/ShadowEntityHeaderController.java | 3 +- .../testutils/shadow/ShadowFragment.java | 6 ++-- .../AutoSyncDataPreferenceControllerTest.java | 2 +- ...cPersonalDataPreferenceControllerTest.java | 2 +- ...oSyncWorkDataPreferenceControllerTest.java | 3 +- .../settings/users/UserSettingsTest.java | 14 ++++---- .../settings/vpn2/AppDialogFragmentTest.java | 3 +- .../WallpaperSuggestionActivityTest.java | 1 - .../widget/EntityHeaderControllerTest.java | 2 +- .../widget/ScrollToParentEditTextTest.java | 1 - .../settings/widget/VideoPreferenceTest.java | 1 - .../UseOpenWifiPreferenceControllerTest.java | 2 +- .../WifiScanningRequiredFragmentTest.java | 3 +- .../ui/AccessibilitySettingsTests.java | 4 +-- .../settings/ui/AppsSettingsTests.java | 5 --- .../settings/ui/ConnectedDeviceTests.java | 6 ++-- .../settings/ui/DataUsageSettingsTests.java | 1 - .../ui/MoreWirelessSettingsTest2.java | 1 - .../ui/NotificationSettingsTests.java | 2 +- .../settings/ui/SoundSettingsTest.java | 10 ++---- .../android/settings/ui/SyncSettingsTest.java | 4 +-- .../settings/ui/ZonePickerSettingsTest.java | 12 +++---- .../settings/EncryptionInterstitialTest.java | 1 - .../RegulatoryInfoDisplayActivityTest.java | 14 ++++---- .../android/settings/SettingsHookTests.java | 2 -- .../android/settings/UserCredentialsTest.java | 4 +-- .../src/com/android/settings/UtilsTest.java | 8 ++--- ...ibilityShortcutPreferenceFragmentTest.java | 12 +++---- .../accounts/AccountsSettingsTest.java | 4 +-- .../applications/AppOpsSettingsTest.java | 14 ++++---- .../ManageApplicationsLaunchTest.java | 12 +++---- .../settings/backup/BackupIntentTest.java | 4 +-- .../FingerprintEnrollFinishTest.java | 1 - .../bluetooth/Utf8ByteLengthFilterTest.java | 2 -- .../settings/core/UserRestrictionTest.java | 1 - .../DashboardSummaryInstrumentationTest.java | 3 +- .../dashboard/PreferenceThemeTest.java | 19 +++++------ .../timezone/model/TimeZoneDataTest.java | 1 - .../deviceinfo/PrivateVolumeForgetTest.java | 3 +- .../StorageDashboardFragmentTest.java | 20 +++++------ .../dream/DreamSettingsLaunchTest.java | 1 + .../fuelgauge/batterytip/RestrictAppTest.java | 1 - .../AppNotificationSettingsTest.java | 5 +-- .../ChannelNotificationSettingsTest.java | 2 -- .../ZenModeSettingsIntegrationTest.java | 2 -- .../password/ChooseLockPasswordTest.java | 2 -- .../SetupChooseLockPasswordAppTest.java | 3 -- .../print/PrintJobSettingsActivityTest.java | 3 +- .../tests/BluetoothRequestPermissionTest.java | 1 + .../tests/DrawOverlayDetailsTest.java | 33 ++++++++++--------- .../settings/tests/KeepOnScreenTest.java | 16 ++++----- .../android/settings/tests/Manufacturer.java | 1 + .../com/android/settings/tests/Operator.java | 1 + .../tests/PrivateVolumeSettingsTest.java | 10 +++--- .../tests/SettingsRestoreAfterCloseTest.java | 1 + .../settings/users/UserSettingsTest.java | 4 +-- .../settings/utils/FileSizeFormatterTest.java | 1 - .../settings/utils/MockedServiceManager.java | 1 - .../settings/vpn2/AppSettingsTest.java | 1 - .../settings/vpn2/PreferenceListTest.java | 27 ++++++++------- .../wifi/WifiCallingSettingUiTest.java | 1 - .../settings/wifi/WifiSettingsUiTest.java | 7 ++-- .../wifi/tether/TetherServiceTest.java | 17 +++++----- .../wifi/tether/WifiTetherSettingsTest.java | 10 +++--- 309 files changed, 498 insertions(+), 555 deletions(-) diff --git a/src/com/android/settings/CustomListPreference.java b/src/com/android/settings/CustomListPreference.java index c6663808974..9047752e054 100644 --- a/src/com/android/settings/CustomListPreference.java +++ b/src/com/android/settings/CustomListPreference.java @@ -18,8 +18,6 @@ package com.android.settings; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; -import android.app.FragmentTransaction; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; @@ -30,8 +28,9 @@ import android.util.AttributeSet; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; import androidx.preference.ListPreference; -import androidx.preference.ListPreferenceDialogFragment; public class CustomListPreference extends ListPreference { diff --git a/src/com/android/settings/RestrictedListPreference.java b/src/com/android/settings/RestrictedListPreference.java index 4ea38b913b7..7e4c456ff88 100644 --- a/src/com/android/settings/RestrictedListPreference.java +++ b/src/com/android/settings/RestrictedListPreference.java @@ -41,7 +41,6 @@ import com.android.settingslib.RestrictedPreferenceHelper; import java.util.ArrayList; import java.util.List; -import androidx.preference.ListPreferenceDialogFragment; import androidx.preference.PreferenceViewHolder; public class RestrictedListPreference extends CustomListPreference { diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 9673948babd..7513e4391d0 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -20,9 +20,6 @@ import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO; import android.app.ActionBar; import android.app.ActivityManager; -import android.app.Fragment; -import android.app.FragmentManager; -import android.app.FragmentTransaction; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -45,12 +42,6 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.Toolbar; -import androidx.annotation.VisibleForTesting; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceFragment; -import androidx.preference.PreferenceManager; - import com.android.internal.util.ArrayUtils; import com.android.settings.Settings.WifiSettingsActivity; import com.android.settings.applications.manageapplications.ManageApplications; @@ -73,6 +64,15 @@ import com.android.settingslib.utils.ThreadUtils; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceManager; + public class SettingsActivity extends SettingsBaseActivity implements PreferenceManager.OnPreferenceTreeClickListener, diff --git a/src/com/android/settings/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java index d64bcb3718f..d3c3b48bd79 100644 --- a/src/com/android/settings/SettingsLicenseActivity.java +++ b/src/com/android/settings/SettingsLicenseActivity.java @@ -17,11 +17,9 @@ package com.android.settings; import android.app.Activity; -import android.app.LoaderManager; import android.content.ActivityNotFoundException; import android.content.ContentResolver; import android.content.Intent; -import android.content.Loader; import android.net.Uri; import android.os.Bundle; import android.os.SystemProperties; @@ -36,6 +34,8 @@ import java.io.File; import androidx.annotation.VisibleForTesting; import androidx.core.content.FileProvider; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; /** * 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 d0bfa55b90a..74b14050e1e 100644 --- a/src/com/android/settings/SettingsPreferenceFragment.java +++ b/src/com/android/settings/SettingsPreferenceFragment.java @@ -18,8 +18,6 @@ package com.android.settings; import android.app.Activity; import android.app.Dialog; -import android.app.DialogFragment; -import android.app.Fragment; import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; @@ -52,6 +50,8 @@ 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; diff --git a/src/com/android/settings/UserCredentialsSettings.java b/src/com/android/settings/UserCredentialsSettings.java index 0342651d332..20defb3f546 100644 --- a/src/com/android/settings/UserCredentialsSettings.java +++ b/src/com/android/settings/UserCredentialsSettings.java @@ -20,8 +20,6 @@ import android.annotation.LayoutRes; import android.annotation.Nullable; import android.app.AlertDialog; import android.app.Dialog; -import android.app.DialogFragment; -import android.app.Fragment; import android.content.Context; import android.content.DialogInterface; import android.os.AsyncTask; @@ -59,6 +57,8 @@ import java.util.List; import java.util.SortedMap; import java.util.TreeMap; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.RecyclerView; public class UserCredentialsSettings extends SettingsPreferenceFragment diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index 109bbf9b4e4..55ec1596093 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -24,7 +24,6 @@ import static android.text.format.DateUtils.FORMAT_SHOW_DATE; import android.annotation.Nullable; import android.app.ActivityManager; import android.app.AppGlobals; -import android.app.Fragment; import android.app.IActivityManager; import android.app.KeyguardManager; import android.app.admin.DevicePolicyManager; @@ -99,6 +98,7 @@ 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; diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java index 95a566c22a7..1d5f8f478ca 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java @@ -27,7 +27,6 @@ import com.android.settings.support.actionbar.HelpResourceProvider; import com.android.settingslib.core.instrumentation.Instrumentable; import androidx.preference.Preference; -import androidx.preference.PreferenceFragment; public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivity { diff --git a/src/com/android/settings/accessibility/ColorInversionPreferenceController.java b/src/com/android/settings/accessibility/ColorInversionPreferenceController.java index 091f109acb5..bd989dc6680 100644 --- a/src/com/android/settings/accessibility/ColorInversionPreferenceController.java +++ b/src/com/android/settings/accessibility/ColorInversionPreferenceController.java @@ -22,8 +22,6 @@ import android.provider.Settings; import com.android.settings.core.TogglePreferenceController; import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; public class ColorInversionPreferenceController extends TogglePreferenceController { @VisibleForTesting diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java index eacc68f8ec3..bca6195dfb8 100644 --- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java +++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java @@ -24,7 +24,6 @@ import static com.android.internal.accessibility.AccessibilityShortcutController import android.accessibilityservice.AccessibilityServiceInfo; import android.app.Activity; import android.app.Dialog; -import android.app.Fragment; import android.content.ComponentName; import android.content.Context; import android.content.DialogInterface; @@ -55,6 +54,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import androidx.fragment.app.Fragment; + /** * Fragment for picking accessibility shortcut service */ diff --git a/src/com/android/settings/accounts/AccountHeaderPreferenceController.java b/src/com/android/settings/accounts/AccountHeaderPreferenceController.java index 7866cc7e3dd..54b042c70f4 100644 --- a/src/com/android/settings/accounts/AccountHeaderPreferenceController.java +++ b/src/com/android/settings/accounts/AccountHeaderPreferenceController.java @@ -35,7 +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.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; public class AccountHeaderPreferenceController extends AbstractPreferenceController diff --git a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java index d051279bcf4..4598f769ecd 100644 --- a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java +++ b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java @@ -41,7 +41,6 @@ import com.android.settingslib.core.instrumentation.Instrumentable; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java index 11094e6c047..8df485c42fe 100644 --- a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java +++ b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java @@ -24,7 +24,6 @@ import android.accounts.OperationCanceledException; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -46,6 +45,7 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.io.IOException; +import androidx.fragment.app.Fragment; import androidx.preference.PreferenceScreen; public class RemoveAccountPreferenceController extends AbstractPreferenceController diff --git a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java index aaf1d5825eb..e8b7d007335 100644 --- a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java +++ b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java @@ -18,7 +18,6 @@ package com.android.settings.applications; import android.app.Activity; import android.app.Application; -import android.app.Fragment; import android.content.Context; import android.provider.SearchIndexableResource; @@ -34,6 +33,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import androidx.fragment.app.Fragment; + @SearchIndexable public class AppAndNotificationDashboardFragment extends DashboardFragment { diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java index f8a222d5e30..f5a34b12ae7 100644 --- a/src/com/android/settings/applications/AppInfoBase.java +++ b/src/com/android/settings/applications/AppInfoBase.java @@ -21,8 +21,6 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; -import android.app.DialogFragment; -import android.app.Fragment; import android.app.admin.DevicePolicyManager; import android.content.BroadcastReceiver; import android.content.Context; @@ -53,6 +51,9 @@ import com.android.settingslib.applications.ApplicationsState.AppEntry; import java.util.ArrayList; +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/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java index 576a0a2a304..897cbc7a59e 100644 --- a/src/com/android/settings/applications/AppStorageSettings.java +++ b/src/com/android/settings/applications/AppStorageSettings.java @@ -25,12 +25,10 @@ import android.app.ActivityManager; import android.app.AlertDialog; import android.app.AppGlobals; import android.app.GrantedUriPermission; -import android.app.LoaderManager; import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.content.Loader; import android.content.pm.ApplicationInfo; import android.content.pm.IPackageDataObserver; import android.content.pm.PackageManager; @@ -66,6 +64,8 @@ import java.util.Objects; import java.util.TreeMap; import androidx.annotation.VisibleForTesting; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; diff --git a/src/com/android/settings/applications/RecentAppsPreferenceController.java b/src/com/android/settings/applications/RecentAppsPreferenceController.java index 57cf8e3610d..24ffd141fd7 100644 --- a/src/com/android/settings/applications/RecentAppsPreferenceController.java +++ b/src/com/android/settings/applications/RecentAppsPreferenceController.java @@ -20,7 +20,6 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent .SETTINGS_APP_NOTIF_CATEGORY; import android.app.Application; -import android.app.Fragment; import android.app.usage.UsageStats; import android.app.usage.UsageStatsManager; import android.content.Context; @@ -52,6 +51,7 @@ 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; diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java index 770b1d6e4a8..0461343872c 100644 --- a/src/com/android/settings/applications/RunningServiceDetails.java +++ b/src/com/android/settings/applications/RunningServiceDetails.java @@ -5,7 +5,6 @@ import android.app.ActivityManager; import android.app.AlertDialog; import android.app.ApplicationErrorReport; import android.app.Dialog; -import android.app.DialogFragment; import android.app.PendingIntent; import android.content.ActivityNotFoundException; import android.content.ComponentName; @@ -45,6 +44,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collections; +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/appinfo/AppBatteryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java index 53c514732b7..32fcef51666 100644 --- a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java @@ -16,9 +16,7 @@ package com.android.settings.applications.appinfo; -import android.app.LoaderManager; import android.content.Context; -import android.content.Loader; import android.content.pm.PackageInfo; import android.os.BatteryStats; import android.os.Bundle; @@ -43,6 +41,8 @@ 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; diff --git a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java index f5b5c732cc4..a1aafede577 100644 --- a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.applications.appinfo; import android.app.Activity; import android.app.ActivityManager; -import android.app.Fragment; import android.app.admin.DevicePolicyManager; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -65,6 +64,7 @@ import java.util.HashSet; import java.util.List; import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; import androidx.preference.PreferenceScreen; /** diff --git a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java index 3b324e4de13..925d982ea90 100644 --- a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java @@ -16,9 +16,7 @@ package com.android.settings.applications.appinfo; -import android.app.LoaderManager; import android.content.Context; -import android.content.Loader; import android.net.INetworkStatsService; import android.net.INetworkStatsSession; import android.net.NetworkTemplate; @@ -42,6 +40,8 @@ import com.android.settingslib.net.ChartData; import com.android.settingslib.net.ChartDataLoader; import androidx.annotation.VisibleForTesting; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java b/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java index 64713bc2867..7ff13014f1a 100644 --- a/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java @@ -16,9 +16,7 @@ package com.android.settings.applications.appinfo; -import android.app.LoaderManager; import android.content.Context; -import android.content.Loader; import android.content.pm.ApplicationInfo; import android.os.Bundle; import android.os.UserHandle; @@ -34,6 +32,8 @@ 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 diff --git a/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java b/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java index 9c9197ec740..87f6cefac9e 100644 --- a/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java @@ -16,7 +16,6 @@ package com.android.settings.applications.appinfo; -import android.app.DialogFragment; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -43,6 +42,7 @@ 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 diff --git a/src/com/android/settings/applications/appops/AppOpsCategory.java b/src/com/android/settings/applications/appops/AppOpsCategory.java index b506ce0ad7a..bdc96897454 100644 --- a/src/com/android/settings/applications/appops/AppOpsCategory.java +++ b/src/com/android/settings/applications/appops/AppOpsCategory.java @@ -17,14 +17,10 @@ package com.android.settings.applications.appops; import android.app.AppOpsManager; -import android.app.ListFragment; -import android.app.LoaderManager; -import android.content.AsyncTaskLoader; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.content.Loader; import android.content.pm.ActivityInfo; import android.content.res.Configuration; import android.content.res.Resources; @@ -43,6 +39,11 @@ 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; + 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 b347e930695..1d804ceb697 100644 --- a/src/com/android/settings/applications/appops/BackgroundCheckSummary.java +++ b/src/com/android/settings/applications/appops/BackgroundCheckSummary.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appops; import android.annotation.Nullable; -import android.app.FragmentTransaction; import android.os.Bundle; import android.preference.PreferenceFrameLayout; import android.view.LayoutInflater; @@ -28,6 +27,8 @@ 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/defaultapps/DefaultAppPickerFragment.java b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java index 485f4826c76..81606b85694 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java +++ b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java @@ -19,8 +19,6 @@ package com.android.settings.applications.defaultapps; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; -import android.app.DialogFragment; -import android.app.Fragment; import android.content.Context; import android.content.DialogInterface; import android.content.pm.PackageManager; @@ -36,6 +34,9 @@ import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.widget.CandidateInfo; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; + /** * A generic app picker fragment that shows a list of app as radio button group. */ diff --git a/src/com/android/settings/applications/manageapplications/FileViewHolderController.java b/src/com/android/settings/applications/manageapplications/FileViewHolderController.java index 4e6bf262530..ded0286d16b 100644 --- a/src/com/android/settings/applications/manageapplications/FileViewHolderController.java +++ b/src/com/android/settings/applications/manageapplications/FileViewHolderController.java @@ -16,7 +16,7 @@ package com.android.settings.applications.manageapplications; -import android.app.Fragment; +import androidx.fragment.app.Fragment; /** * FileViewHolderController handles adapting the AppViewHolder to work as a general purpose diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java index 262281de056..de4558e2fb7 100644 --- a/src/com/android/settings/applications/manageapplications/ManageApplications.java +++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java @@ -16,6 +16,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 @@ -37,8 +38,6 @@ import static com.android.settings.applications.manageapplications.AppFilterRegi import static com.android.settings.applications.manageapplications.AppFilterRegistry .FILTER_APPS_WORK; -import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE; - import android.annotation.Nullable; import android.annotation.StringRes; import android.app.Activity; diff --git a/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java b/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java index 398158e19c0..c93ae134289 100644 --- a/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java +++ b/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java @@ -16,7 +16,6 @@ package com.android.settings.applications.manageapplications; -import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.os.UserHandle; @@ -31,6 +30,7 @@ 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 039eb614d28..55fbc52bb2f 100644 --- a/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java +++ b/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java @@ -16,7 +16,6 @@ package com.android.settings.applications.manageapplications; -import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.os.UserHandle; @@ -30,6 +29,7 @@ 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 { diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java index 06e3f1a58f3..6e0f915af9e 100644 --- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java +++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java @@ -62,7 +62,6 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.EventLogTags; import com.android.settings.R; import com.android.settings.fuelgauge.BatteryUtils; - import com.android.settings.overlay.FeatureFactory; import com.android.settings.users.UserDialogs; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/backup/BackupSettingsActivity.java b/src/com/android/settings/backup/BackupSettingsActivity.java index 758d3bec0b7..3d48cdda933 100644 --- a/src/com/android/settings/backup/BackupSettingsActivity.java +++ b/src/com/android/settings/backup/BackupSettingsActivity.java @@ -17,7 +17,6 @@ package com.android.settings.backup; import android.app.Activity; -import android.app.FragmentManager; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -35,6 +34,7 @@ import java.util.ArrayList; import java.util.List; import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.FragmentManager; /** diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java index 5539016dd71..76ee78bc0ec 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java @@ -41,7 +41,6 @@ import android.widget.Toast; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.SubSettings; import com.android.settings.Utils; import com.android.settings.biometrics.BiometricSettings; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java index 40275c35bfd..93e3b0d2155 100644 --- a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java +++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java @@ -19,7 +19,6 @@ package com.android.settings.biometrics.fingerprint; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; -import android.app.FragmentManager; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; @@ -33,6 +32,7 @@ import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.password.ChooseLockSettingsHelper; import androidx.annotation.NonNull; +import androidx.fragment.app.FragmentManager; public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSensor { diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java index a3f444c0fa1..4993151627e 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java @@ -23,7 +23,6 @@ import com.android.settings.widget.ActionButtonPreference; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.lifecycle.Lifecycle; -import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; /** diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsController.java index 7bf165c19e1..623c433b599 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsController.java @@ -26,7 +26,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.PreferenceFragment; import androidx.preference.PreferenceScreen; /** diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java index 200dcc2c5e4..16b54bbd842 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java @@ -30,7 +30,6 @@ import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.core.lifecycle.Lifecycle; -import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; /** diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java index 8433482f110..0cb73289cbe 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java @@ -24,7 +24,6 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.FooterPreferenceMixin; -import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; /** diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java index ed51a520b75..22906495479 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java @@ -36,7 +36,6 @@ import java.util.List; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java index d9246ef3d14..0fb2f87744d 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java @@ -16,7 +16,6 @@ package com.android.settings.bluetooth; -import android.app.Fragment; import android.content.Context; import android.text.TextUtils; @@ -26,6 +25,7 @@ import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; import androidx.preference.Preference; public class BluetoothDeviceRenamePreferenceController extends diff --git a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java index c9fa0566462..db11164922e 100644 --- a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java @@ -18,8 +18,8 @@ package com.android.settings.bluetooth; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; - import android.util.Log; + import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; import com.android.settingslib.bluetooth.CachedBluetoothDevice; diff --git a/src/com/android/settings/core/SubSettingLauncher.java b/src/com/android/settings/core/SubSettingLauncher.java index 3268399d595..f3f37485b5c 100644 --- a/src/com/android/settings/core/SubSettingLauncher.java +++ b/src/com/android/settings/core/SubSettingLauncher.java @@ -17,7 +17,6 @@ package com.android.settings.core; import android.annotation.StringRes; -import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -29,6 +28,7 @@ import com.android.settings.SubSettings; import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin; import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; public class SubSettingLauncher { diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java index 1b9b75f7139..00e18c5a715 100644 --- a/src/com/android/settings/dashboard/DashboardSummary.java +++ b/src/com/android/settings/dashboard/DashboardSummary.java @@ -17,7 +17,6 @@ package com.android.settings.dashboard; import android.app.Activity; -import android.app.LoaderManager; import android.content.Context; import android.os.Bundle; import android.os.Handler; @@ -49,6 +48,7 @@ import java.util.List; import androidx.annotation.VisibleForTesting; import androidx.annotation.WorkerThread; +import androidx.loader.app.LoaderManager; import androidx.recyclerview.widget.LinearLayoutManager; public class DashboardSummary extends InstrumentedFragment diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java index 1d58ed5ad1a..14e4c369200 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java @@ -27,9 +27,9 @@ import android.util.Pair; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.Settings.NightDisplaySuggestionActivity; -import com.android.settings.display.NightDisplayPreferenceController; import com.android.settings.biometrics.fingerprint.FingerprintEnrollSuggestionActivity; import com.android.settings.biometrics.fingerprint.FingerprintSuggestionActivity; +import com.android.settings.display.NightDisplayPreferenceController; import com.android.settings.notification.ZenOnboardingActivity; import com.android.settings.notification.ZenSuggestionActivity; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java index d2950b36bf7..a7ec7de859f 100644 --- a/src/com/android/settings/datausage/AppDataUsage.java +++ b/src/com/android/settings/datausage/AppDataUsage.java @@ -17,10 +17,8 @@ package com.android.settings.datausage; import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND; import android.app.Activity; -import android.app.LoaderManager; import android.content.Context; import android.content.Intent; -import android.content.Loader; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; @@ -52,6 +50,8 @@ 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; diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java index 197053a1cb9..1fb2f723a6a 100644 --- a/src/com/android/settings/datausage/BillingCycleSettings.java +++ b/src/com/android/settings/datausage/BillingCycleSettings.java @@ -19,7 +19,6 @@ import static android.net.NetworkPolicy.WARNING_DISABLED; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; import android.content.Context; import android.content.DialogInterface; import android.content.res.Resources; @@ -48,6 +47,7 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; +import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.SwitchPreference; diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java index 59f3c0ef5b9..032f33781b4 100644 --- a/src/com/android/settings/datausage/DataUsageList.java +++ b/src/com/android/settings/datausage/DataUsageList.java @@ -21,10 +21,8 @@ import static android.net.TrafficStats.UID_TETHERING; import static android.telephony.TelephonyManager.SIM_STATE_READY; import android.app.ActivityManager; -import android.app.LoaderManager.LoaderCallbacks; import android.content.Context; import android.content.Intent; -import android.content.Loader; import android.content.pm.UserInfo; import android.graphics.Color; import android.net.ConnectivityManager; @@ -68,6 +66,8 @@ 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; diff --git a/src/com/android/settings/datetime/timezone/model/TimeZoneDataLoader.java b/src/com/android/settings/datetime/timezone/model/TimeZoneDataLoader.java index 92232072814..fae3df63975 100644 --- a/src/com/android/settings/datetime/timezone/model/TimeZoneDataLoader.java +++ b/src/com/android/settings/datetime/timezone/model/TimeZoneDataLoader.java @@ -16,13 +16,14 @@ package com.android.settings.datetime.timezone.model; -import android.app.LoaderManager; import android.content.Context; -import android.content.Loader; import android.os.Bundle; import com.android.settingslib.utils.AsyncLoader; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; + public class TimeZoneDataLoader extends AsyncLoader { public TimeZoneDataLoader(Context context) { diff --git a/src/com/android/settings/deletionhelper/ActivationWarningFragment.java b/src/com/android/settings/deletionhelper/ActivationWarningFragment.java index 1f6fb6b24c7..1618e2a49be 100644 --- a/src/com/android/settings/deletionhelper/ActivationWarningFragment.java +++ b/src/com/android/settings/deletionhelper/ActivationWarningFragment.java @@ -18,11 +18,12 @@ package com.android.settings.deletionhelper; import android.app.AlertDialog; import android.app.Dialog; -import android.app.DialogFragment; import android.os.Bundle; import com.android.settings.R; +import androidx.fragment.app.DialogFragment; + /** * Fragment to warn the user about activating the storage manager. */ diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java index 6d6b544e29a..3182d8af0fe 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java @@ -16,7 +16,6 @@ package com.android.settings.deletionhelper; -import android.app.FragmentManager; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; @@ -28,6 +27,7 @@ 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}. */ diff --git a/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java b/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java index d315517566c..ddd9021ba35 100644 --- a/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java +++ b/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java @@ -18,7 +18,6 @@ package com.android.settings.development; import android.app.AlertDialog; import android.app.Dialog; -import android.app.FragmentManager; import android.content.DialogInterface; import android.os.Bundle; import android.os.PowerManager; @@ -27,6 +26,8 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +import androidx.fragment.app.FragmentManager; + public class BluetoothA2dpHwOffloadRebootDialog extends InstrumentedDialogFragment implements DialogInterface.OnClickListener { diff --git a/src/com/android/settings/development/ClearAdbKeysWarningDialog.java b/src/com/android/settings/development/ClearAdbKeysWarningDialog.java index 61b55a02f62..43e7c8fb04f 100644 --- a/src/com/android/settings/development/ClearAdbKeysWarningDialog.java +++ b/src/com/android/settings/development/ClearAdbKeysWarningDialog.java @@ -18,8 +18,6 @@ package com.android.settings.development; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; -import android.app.FragmentManager; import android.content.DialogInterface; import android.os.Bundle; @@ -27,6 +25,9 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; + public class ClearAdbKeysWarningDialog extends InstrumentedDialogFragment implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener { diff --git a/src/com/android/settings/development/DisableLogPersistWarningDialog.java b/src/com/android/settings/development/DisableLogPersistWarningDialog.java index 1ab3a92a69e..7223d8ec1be 100644 --- a/src/com/android/settings/development/DisableLogPersistWarningDialog.java +++ b/src/com/android/settings/development/DisableLogPersistWarningDialog.java @@ -18,8 +18,6 @@ package com.android.settings.development; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; -import android.app.FragmentManager; import android.content.DialogInterface; import android.os.Bundle; @@ -27,6 +25,9 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; + public class DisableLogPersistWarningDialog extends InstrumentedDialogFragment implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener { diff --git a/src/com/android/settings/development/EnableAdbWarningDialog.java b/src/com/android/settings/development/EnableAdbWarningDialog.java index 9829f70d1e3..1dac782c1b1 100644 --- a/src/com/android/settings/development/EnableAdbWarningDialog.java +++ b/src/com/android/settings/development/EnableAdbWarningDialog.java @@ -18,8 +18,6 @@ package com.android.settings.development; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; -import android.app.FragmentManager; import android.content.DialogInterface; import android.os.Bundle; @@ -27,6 +25,9 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; + 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 3c3d645911f..667f6214f2f 100644 --- a/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java +++ b/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java @@ -18,7 +18,6 @@ package com.android.settings.development; import android.app.AlertDialog; import android.app.Dialog; -import android.app.FragmentManager; import android.content.DialogInterface; import android.os.Bundle; @@ -26,6 +25,8 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +import androidx.fragment.app.FragmentManager; + public class EnableDevelopmentSettingWarningDialog extends InstrumentedDialogFragment implements DialogInterface.OnClickListener { diff --git a/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java b/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java index 2486ef53589..64a1b6bba14 100644 --- a/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java +++ b/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java @@ -18,8 +18,6 @@ package com.android.settings.development; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; -import android.app.FragmentManager; import android.content.DialogInterface; import android.os.Bundle; @@ -27,6 +25,9 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; + public class EnableOemUnlockSettingWarningDialog extends InstrumentedDialogFragment implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener { diff --git a/src/com/android/settings/development/OemLockInfoDialog.java b/src/com/android/settings/development/OemLockInfoDialog.java index 6d7581272dc..74babf26f57 100644 --- a/src/com/android/settings/development/OemLockInfoDialog.java +++ b/src/com/android/settings/development/OemLockInfoDialog.java @@ -18,14 +18,15 @@ package com.android.settings.development; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; -import android.app.FragmentManager; 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.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; + public class OemLockInfoDialog extends InstrumentedDialogFragment { private static final String TAG = "OemLockInfoDialog"; diff --git a/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java b/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java index 731dc6f2814..4892bc04245 100644 --- a/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java +++ b/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java @@ -20,7 +20,6 @@ import android.content.Context; import android.os.SystemProperties; import android.text.TextUtils; import android.util.FeatureFlagUtils; -import android.util.Log; import com.android.settings.core.FeatureFlags; diff --git a/src/com/android/settings/development/featureflags/FeatureFlagPreference.java b/src/com/android/settings/development/featureflags/FeatureFlagPreference.java index ebf35de1f31..0e0c7a6883b 100644 --- a/src/com/android/settings/development/featureflags/FeatureFlagPreference.java +++ b/src/com/android/settings/development/featureflags/FeatureFlagPreference.java @@ -18,7 +18,6 @@ package com.android.settings.development.featureflags; import android.content.Context; import android.util.FeatureFlagUtils; -import android.util.Log; import androidx.preference.SwitchPreference; diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java index f3be9e25041..171a6d39813 100644 --- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java +++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.deviceinfo; import android.app.Activity; -import android.app.Fragment; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -44,6 +43,7 @@ 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; diff --git a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java index 5ea9c2df4d2..9040227c91c 100644 --- a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java +++ b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java @@ -15,7 +15,6 @@ */ package com.android.settings.deviceinfo; -import android.app.Fragment; import android.content.Context; import android.os.Build; import android.text.TextUtils; @@ -29,6 +28,7 @@ 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; diff --git a/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java b/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java index 169b6bbfa1e..cd91b574870 100644 --- a/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java +++ b/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java @@ -15,7 +15,6 @@ */ package com.android.settings.deviceinfo; -import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.text.TextUtils; @@ -24,6 +23,7 @@ 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 diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java index d9cbc60b101..8c7fa0959d9 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java @@ -18,7 +18,6 @@ package com.android.settings.deviceinfo; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; @@ -39,6 +38,7 @@ import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.search.actionbar.SearchMenuController; import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; public class PrivateVolumeForget extends InstrumentedFragment { @VisibleForTesting diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java index b248279e00d..a200c3ae025 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java @@ -18,7 +18,6 @@ package com.android.settings.deviceinfo; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -66,6 +65,7 @@ import java.util.HashMap; import java.util.List; import java.util.Objects; +import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java index 395740c987b..a44e9a9ddd4 100644 --- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java +++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java @@ -17,10 +17,8 @@ package com.android.settings.deviceinfo; import android.app.Activity; -import android.app.LoaderManager; import android.app.usage.StorageStatsManager; import android.content.Context; -import android.content.Loader; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; @@ -57,6 +55,8 @@ 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 diff --git a/src/com/android/settings/deviceinfo/StorageProfileFragment.java b/src/com/android/settings/deviceinfo/StorageProfileFragment.java index 29b838b87d6..06c9802baba 100644 --- a/src/com/android/settings/deviceinfo/StorageProfileFragment.java +++ b/src/com/android/settings/deviceinfo/StorageProfileFragment.java @@ -16,9 +16,7 @@ package com.android.settings.deviceinfo; -import android.app.LoaderManager; import android.content.Context; -import android.content.Loader; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; @@ -41,6 +39,8 @@ 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 diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java index a4e900b3b5b..90da85c0104 100644 --- a/src/com/android/settings/deviceinfo/StorageSettings.java +++ b/src/com/android/settings/deviceinfo/StorageSettings.java @@ -20,7 +20,6 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -62,6 +61,7 @@ import java.util.List; import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; diff --git a/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialog.java b/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialog.java index 9808069f3ef..c016cb62c62 100644 --- a/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialog.java +++ b/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialog.java @@ -18,7 +18,6 @@ package com.android.settings.deviceinfo.aboutphone; import android.app.AlertDialog; import android.app.Dialog; -import android.app.FragmentManager; import android.content.DialogInterface; import android.os.Bundle; @@ -26,6 +25,8 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +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/FirmwareVersionDialogFragment.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java index 0087444605b..17a96920883 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java @@ -18,8 +18,6 @@ package com.android.settings.deviceinfo.firmwareversion; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; -import android.app.FragmentManager; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -29,6 +27,9 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; + 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 9019c6e9e95..f31a504bfe7 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java @@ -16,13 +16,13 @@ package com.android.settings.deviceinfo.firmwareversion; -import android.app.Fragment; 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; public class FirmwareVersionPreferenceController extends BasePreferenceController { diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java index db68a5f4e06..01fb04a049c 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java @@ -18,8 +18,6 @@ package com.android.settings.deviceinfo.imei; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; -import android.app.FragmentManager; import android.os.Bundle; import android.text.TextUtils; import android.view.LayoutInflater; @@ -32,6 +30,8 @@ import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; public class ImeiInfoDialogFragment extends InstrumentedDialogFragment { diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java index 043773e8679..75a1333e0b6 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.deviceinfo.imei; import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA; -import android.app.Fragment; import android.content.Context; import android.telephony.TelephonyManager; @@ -30,6 +29,7 @@ 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; diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java index a15cb81e011..ef5118596ce 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java @@ -18,8 +18,6 @@ package com.android.settings.deviceinfo.simstatus; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; -import android.app.FragmentManager; import android.os.Bundle; import android.text.TextUtils; import android.view.LayoutInflater; @@ -30,6 +28,9 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; + 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 e80434be46d..7c211c29707 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java @@ -16,7 +16,6 @@ package com.android.settings.deviceinfo.simstatus; -import android.app.Fragment; import android.content.Context; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; @@ -30,6 +29,7 @@ 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; diff --git a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java index fad2c8e775e..02965afe6ec 100644 --- a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.deviceinfo.storage; import android.app.ActivityManager; -import android.app.FragmentManager; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; @@ -35,6 +34,7 @@ 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 diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java index b7dc24f1b25..fa1e8e2b935 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java @@ -16,7 +16,6 @@ package com.android.settings.deviceinfo.storage; -import android.app.Fragment; import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; @@ -48,6 +47,7 @@ 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; diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java index 8fe50903023..1e48f5883da 100644 --- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java @@ -19,10 +19,8 @@ package com.android.settings.fuelgauge; import android.annotation.UserIdInt; import android.app.Activity; import android.app.ActivityManager; -import android.app.LoaderManager; import android.content.Context; import android.content.Intent; -import android.content.Loader; import android.content.pm.PackageManager; import android.os.BatteryStats; import android.os.Bundle; @@ -61,6 +59,8 @@ 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; /** diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java index 593cc770f69..87fa13c4359 100644 --- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java @@ -36,7 +36,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; /** diff --git a/src/com/android/settings/fuelgauge/HighPowerDetail.java b/src/com/android/settings/fuelgauge/HighPowerDetail.java index 7dfa0befa73..021c108649a 100644 --- a/src/com/android/settings/fuelgauge/HighPowerDetail.java +++ b/src/com/android/settings/fuelgauge/HighPowerDetail.java @@ -19,7 +19,6 @@ package com.android.settings.fuelgauge; import android.app.AlertDialog; import android.app.AppOpsManager; import android.app.Dialog; -import android.app.Fragment; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; @@ -39,6 +38,8 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.fuelgauge.PowerWhitelistBackend; +import androidx.fragment.app.Fragment; + public class HighPowerDetail extends InstrumentedDialogFragment implements OnClickListener, View.OnClickListener { diff --git a/src/com/android/settings/fuelgauge/PowerUsageBase.java b/src/com/android/settings/fuelgauge/PowerUsageBase.java index 41bf06eaf37..06200a3cc3c 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageBase.java +++ b/src/com/android/settings/fuelgauge/PowerUsageBase.java @@ -18,9 +18,7 @@ package com.android.settings.fuelgauge; import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType; import android.app.Activity; -import android.app.LoaderManager; import android.content.Context; -import android.content.Loader; import android.os.Bundle; import android.os.UserManager; import android.view.Menu; @@ -29,6 +27,8 @@ 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; /** * Common base class for things that need to show the battery usage graph. diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index 828b34bb973..6190b7b53a5 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -19,10 +19,7 @@ package com.android.settings.fuelgauge; import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType; import android.app.Activity; -import android.app.LoaderManager; -import android.app.LoaderManager.LoaderCallbacks; import android.content.Context; -import android.content.Loader; import android.os.BatteryStats; import android.os.Bundle; import android.provider.SearchIndexableResource; @@ -62,6 +59,9 @@ import java.util.Collections; import java.util.List; import androidx.annotation.VisibleForTesting; +import androidx.loader.app.LoaderManager; +import androidx.loader.app.LoaderManager.LoaderCallbacks; +import androidx.loader.content.Loader; /** * Displays a list of apps and subsystems that consume power, ordered by how much power was diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java index a28e13421d5..ba650289918 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java @@ -16,8 +16,6 @@ package com.android.settings.fuelgauge.batterytip.actions; -import android.app.Fragment; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -25,6 +23,8 @@ 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/homepage/HomepageFragment.java b/src/com/android/settings/homepage/HomepageFragment.java index 3b0ca2b647f..9ccb8e2397b 100644 --- a/src/com/android/settings/homepage/HomepageFragment.java +++ b/src/com/android/settings/homepage/HomepageFragment.java @@ -26,8 +26,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Toolbar; -import androidx.annotation.NonNull; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsHomepageActivity; @@ -41,6 +39,8 @@ import com.google.android.material.bottomappbar.BottomAppBar; import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.annotation.NonNull; + public class HomepageFragment extends InstrumentedFragment { private static final String TAG = "HomepageFragment"; diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceController.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceController.java index 625289ccc06..912b5cfd93c 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceController.java +++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceController.java @@ -24,7 +24,6 @@ import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; import com.android.settingslib.inputmethod.InputMethodAndSubtypeEnablerManager; -import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; public class InputMethodAndSubtypePreferenceController extends BasePreferenceController implements diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java index 62c0470eddb..6a03c2262e1 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java @@ -19,12 +19,9 @@ package com.android.settings.inputmethod; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; -import android.app.LoaderManager.LoaderCallbacks; -import android.content.AsyncTaskLoader; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.content.Loader; import android.hardware.input.InputDeviceIdentifier; import android.hardware.input.InputManager; import android.hardware.input.InputManager.InputDeviceListener; @@ -46,6 +43,10 @@ import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import java.util.ArrayList; import java.util.Collections; +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 3ea1016703f..63fe1474963 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerController.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerController.java @@ -17,7 +17,6 @@ package com.android.settings.inputmethod; -import android.app.Fragment; import android.content.Context; import android.hardware.input.InputDeviceIdentifier; import android.hardware.input.InputManager; @@ -33,6 +32,7 @@ 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; diff --git a/src/com/android/settings/inputmethod/UserDictionarySettings.java b/src/com/android/settings/inputmethod/UserDictionarySettings.java index 2613d972935..1e912f1ddf5 100644 --- a/src/com/android/settings/inputmethod/UserDictionarySettings.java +++ b/src/com/android/settings/inputmethod/UserDictionarySettings.java @@ -18,12 +18,9 @@ package com.android.settings.inputmethod; import android.annotation.Nullable; import android.app.ActionBar; -import android.app.ListFragment; -import android.app.LoaderManager; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; -import android.content.Loader; import android.database.Cursor; import android.os.Bundle; import android.provider.UserDictionary; @@ -48,6 +45,10 @@ 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/language/UserDictionaryPreferenceController.java b/src/com/android/settings/language/UserDictionaryPreferenceController.java index fdc1aa91081..cc54b04a79d 100644 --- a/src/com/android/settings/language/UserDictionaryPreferenceController.java +++ b/src/com/android/settings/language/UserDictionaryPreferenceController.java @@ -16,7 +16,6 @@ package com.android.settings.language; -import android.app.Fragment; import android.content.Context; import android.os.Bundle; @@ -27,6 +26,7 @@ import com.android.settings.inputmethod.UserDictionarySettings; import java.util.TreeSet; +import androidx.fragment.app.Fragment; import androidx.preference.Preference; public class UserDictionaryPreferenceController extends BasePreferenceController { diff --git a/src/com/android/settings/localepicker/LocaleListEditor.java b/src/com/android/settings/localepicker/LocaleListEditor.java index d20d5cd8dfd..6b3ed395728 100644 --- a/src/com/android/settings/localepicker/LocaleListEditor.java +++ b/src/com/android/settings/localepicker/LocaleListEditor.java @@ -19,7 +19,6 @@ package com.android.settings.localepicker; import static android.os.UserManager.DISALLOW_CONFIG_LOCALE; import android.app.AlertDialog; -import android.app.FragmentTransaction; import android.content.DialogInterface; import android.os.Bundle; import android.os.LocaleList; @@ -42,6 +41,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; +import androidx.fragment.app.FragmentTransaction; import androidx.recyclerview.widget.RecyclerView; /** diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java index 8272b73f368..094cefa770a 100644 --- a/src/com/android/settings/network/AirplaneModePreferenceController.java +++ b/src/com/android/settings/network/AirplaneModePreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.network; import static android.provider.SettingsSlicesContract.KEY_AIRPLANE_MODE; -import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -35,6 +34,7 @@ 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; diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java index 0ab38bf63c5..f270627de02 100644 --- a/src/com/android/settings/network/NetworkDashboardFragment.java +++ b/src/com/android/settings/network/NetworkDashboardFragment.java @@ -21,7 +21,6 @@ import static com.android.settings.network.MobilePlanPreferenceController import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; import android.content.Context; import android.icu.text.ListFormatter; import android.provider.SearchIndexableResource; @@ -45,6 +44,7 @@ import java.util.Arrays; import java.util.List; import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; @SearchIndexable public class NetworkDashboardFragment extends DashboardFragment implements diff --git a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java index e12b93fe65b..530a2268073 100644 --- a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java +++ b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import android.app.AutomaticZenRule; -import android.app.Fragment; import android.app.NotificationManager; import android.content.ComponentName; import android.content.Context; @@ -38,6 +37,7 @@ 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 diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java index 96a4eb62a6c..adcd393db1b 100644 --- a/src/com/android/settings/notification/ConfigureNotificationSettings.java +++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java @@ -18,7 +18,6 @@ package com.android.settings.notification; import android.app.Activity; import android.app.Application; -import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -41,6 +40,7 @@ import java.util.Arrays; import java.util.List; import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; import androidx.preference.Preference; @SearchIndexable diff --git a/src/com/android/settings/notification/HeaderPreferenceController.java b/src/com/android/settings/notification/HeaderPreferenceController.java index bfede5d8dc0..89a312f6667 100644 --- a/src/com/android/settings/notification/HeaderPreferenceController.java +++ b/src/com/android/settings/notification/HeaderPreferenceController.java @@ -34,7 +34,6 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; import androidx.preference.Preference; -import androidx.preference.PreferenceFragment; public class HeaderPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, LifecycleObserver { diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java index a7e3393dbbd..d21e3445e18 100644 --- a/src/com/android/settings/notification/NotificationAccessSettings.java +++ b/src/com/android/settings/notification/NotificationAccessSettings.java @@ -18,7 +18,6 @@ package com.android.settings.notification; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; import android.app.NotificationManager; import android.content.ComponentName; import android.content.Context; @@ -41,6 +40,8 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; +import androidx.fragment.app.Fragment; + /** * Settings screen for managing notification listener permissions */ diff --git a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java index c014ae73a53..c7a3201fe97 100644 --- a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java +++ b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import android.app.Application; -import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -49,6 +48,7 @@ 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; diff --git a/src/com/android/settings/notification/WorkSoundPreferenceController.java b/src/com/android/settings/notification/WorkSoundPreferenceController.java index c11fbc81138..a77237adc9e 100644 --- a/src/com/android/settings/notification/WorkSoundPreferenceController.java +++ b/src/com/android/settings/notification/WorkSoundPreferenceController.java @@ -19,7 +19,6 @@ package com.android.settings.notification; import android.annotation.UserIdInt; import android.app.AlertDialog; import android.app.Dialog; -import android.app.FragmentManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.DialogInterface; @@ -48,6 +47,7 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.List; +import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceGroup; diff --git a/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java b/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java index 9fe463bb637..4b1c8c5ce71 100644 --- a/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java +++ b/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java @@ -19,7 +19,6 @@ package com.android.settings.notification; import static com.android.settings.widget.EntityHeaderController.PREF_KEY_APP_HEADER; import android.app.AutomaticZenRule; -import android.app.Fragment; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; @@ -35,8 +34,8 @@ 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.PreferenceFragment; 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 7b288b9066a..c980d909a1b 100644 --- a/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java +++ b/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import android.app.AutomaticZenRule; -import android.app.Fragment; import android.content.Context; import android.widget.Switch; @@ -26,6 +25,7 @@ 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; diff --git a/src/com/android/settings/notification/ZenDeleteRuleDialog.java b/src/com/android/settings/notification/ZenDeleteRuleDialog.java index d9061d3b0a4..2783e3b3ce1 100644 --- a/src/com/android/settings/notification/ZenDeleteRuleDialog.java +++ b/src/com/android/settings/notification/ZenDeleteRuleDialog.java @@ -18,7 +18,6 @@ package com.android.settings.notification; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; import android.content.DialogInterface; import android.os.Bundle; import android.view.View; @@ -27,6 +26,8 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +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/ZenModeAddAutomaticRulePreferenceController.java b/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java index 9935f40006a..ffe07ee9581 100644 --- a/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java @@ -16,13 +16,13 @@ package com.android.settings.notification; -import android.app.Fragment; 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; diff --git a/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java b/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java index fba24b12df9..665d5e957cf 100644 --- a/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import android.app.AutomaticZenRule; -import android.app.Fragment; import android.content.Context; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -25,6 +24,7 @@ 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; diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java index 74bc93de079..196b4e76364 100644 --- a/src/com/android/settings/notification/ZenModeAutomationSettings.java +++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java @@ -16,7 +16,6 @@ package com.android.settings.notification; -import android.app.Fragment; import android.content.Context; import android.provider.SearchIndexableResource; import android.service.notification.ConditionProviderService; @@ -34,6 +33,8 @@ 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/ZenModeButtonPreferenceController.java b/src/com/android/settings/notification/ZenModeButtonPreferenceController.java index c1f0eda9166..ac9aaba632d 100644 --- a/src/com/android/settings/notification/ZenModeButtonPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeButtonPreferenceController.java @@ -16,7 +16,6 @@ package com.android.settings.notification; -import android.app.FragmentManager; import android.content.Context; import android.provider.Settings; import android.view.View; @@ -28,6 +27,7 @@ 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 diff --git a/src/com/android/settings/notification/ZenModeDurationPreferenceController.java b/src/com/android/settings/notification/ZenModeDurationPreferenceController.java index baee2cd530b..0f884ddf408 100644 --- a/src/com/android/settings/notification/ZenModeDurationPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeDurationPreferenceController.java @@ -16,13 +16,13 @@ package com.android.settings.notification; -import android.app.FragmentManager; import android.content.Context; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java index a235603f5d0..5043e278bf4 100644 --- a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java +++ b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java @@ -19,7 +19,6 @@ package com.android.settings.notification; import android.app.AlertDialog; import android.app.AutomaticZenRule; import android.app.Dialog; -import android.app.FragmentManager; import android.app.TimePickerDialog; import android.content.Context; import android.content.DialogInterface; @@ -43,6 +42,7 @@ import java.util.Arrays; import java.util.Calendar; import java.util.List; +import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index 26b0e8dfe23..b209ac83068 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -26,7 +26,6 @@ import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CA import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_SYSTEM; import android.app.AutomaticZenRule; -import android.app.FragmentManager; import android.app.NotificationManager; import android.app.NotificationManager.Policy; import android.content.Context; @@ -51,6 +50,7 @@ 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 { diff --git a/src/com/android/settings/notification/ZenRuleNameDialog.java b/src/com/android/settings/notification/ZenRuleNameDialog.java index 819ba5bfaa1..43144546271 100644 --- a/src/com/android/settings/notification/ZenRuleNameDialog.java +++ b/src/com/android/settings/notification/ZenRuleNameDialog.java @@ -18,7 +18,6 @@ package com.android.settings.notification; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; import android.content.Context; import android.content.DialogInterface; import android.net.Uri; @@ -33,6 +32,8 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +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 1be585760d4..e0873c51ce0 100644 --- a/src/com/android/settings/notification/ZenRulePreference.java +++ b/src/com/android/settings/notification/ZenRulePreference.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import android.app.AutomaticZenRule; -import android.app.Fragment; import android.content.ComponentName; import android.content.Context; import android.content.pm.ApplicationInfo; @@ -35,6 +34,7 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import java.util.Map; +import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; diff --git a/src/com/android/settings/notification/ZenRuleSelectionDialog.java b/src/com/android/settings/notification/ZenRuleSelectionDialog.java index 9beac7c7a2e..40b79f78a7a 100644 --- a/src/com/android/settings/notification/ZenRuleSelectionDialog.java +++ b/src/com/android/settings/notification/ZenRuleSelectionDialog.java @@ -20,7 +20,6 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; import android.app.NotificationManager; import android.content.Context; import android.content.DialogInterface; @@ -48,6 +47,8 @@ import java.util.Comparator; import java.util.Set; import java.util.TreeSet; +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 e59cbc3fcbb..3e478d1e3f5 100644 --- a/src/com/android/settings/password/ChooseLockGeneric.java +++ b/src/com/android/settings/password/ChooseLockGeneric.java @@ -18,7 +18,6 @@ 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; @@ -26,8 +25,6 @@ import android.accessibilityservice.AccessibilityServiceInfo; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; -import android.app.FragmentManager; import android.app.admin.DevicePolicyManager; import android.content.Context; import android.content.Intent; @@ -66,6 +63,8 @@ import java.util.List; import androidx.annotation.StringRes; import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java index 15dd72ff525..f65b3adc8c8 100644 --- a/src/com/android/settings/password/ChooseLockPassword.java +++ b/src/com/android/settings/password/ChooseLockPassword.java @@ -23,7 +23,6 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX; import android.app.Activity; -import android.app.Fragment; import android.app.admin.DevicePolicyManager; import android.app.admin.PasswordMetrics; import android.content.Context; @@ -70,6 +69,7 @@ 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; diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java index 855f7aec1ce..a6cf36fb99a 100644 --- a/src/com/android/settings/password/ChooseLockPattern.java +++ b/src/com/android/settings/password/ChooseLockPattern.java @@ -17,7 +17,6 @@ package com.android.settings.password; import android.app.Activity; -import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.content.res.ColorStateList; @@ -55,6 +54,8 @@ 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 4839154b086..4159a61e067 100644 --- a/src/com/android/settings/password/ChooseLockSettingsHelper.java +++ b/src/com/android/settings/password/ChooseLockSettingsHelper.java @@ -18,7 +18,6 @@ package com.android.settings.password; import android.annotation.Nullable; import android.app.Activity; -import android.app.Fragment; import android.app.KeyguardManager; import android.app.admin.DevicePolicyManager; import android.content.Intent; @@ -32,6 +31,8 @@ import com.android.settings.SettingsActivity; import com.android.settings.Utils; import com.android.setupwizardlib.util.WizardManagerHelper; +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 1050a549d57..99921b29043 100644 --- a/src/com/android/settings/password/ChooseLockTypeDialogFragment.java +++ b/src/com/android/settings/password/ChooseLockTypeDialogFragment.java @@ -20,7 +20,6 @@ import android.app.Activity; import android.app.AlertDialog; import android.app.AlertDialog.Builder; import android.app.Dialog; -import android.app.Fragment; import android.app.admin.DevicePolicyManager; import android.content.Context; import android.content.DialogInterface; @@ -43,6 +42,8 @@ import com.android.setupwizardlib.util.WizardManagerHelper; import java.util.List; +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 1775394a944..4dd4a97c4ea 100644 --- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java +++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java @@ -16,7 +16,6 @@ package com.android.settings.password; -import android.app.Fragment; import android.app.KeyguardManager; import android.os.Bundle; import android.os.UserManager; @@ -29,6 +28,8 @@ 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 74207cd5631..fc1fab0218e 100644 --- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java +++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java @@ -22,8 +22,6 @@ import android.app.ActivityManager; import android.app.ActivityOptions; import android.app.AlertDialog; import android.app.Dialog; -import android.app.DialogFragment; -import android.app.FragmentManager; import android.app.IActivityManager; import android.app.KeyguardManager; import android.app.admin.DevicePolicyManager; @@ -52,8 +50,11 @@ import android.widget.TextView; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.Utils; -import com.android.settings.core.InstrumentedFragment; import com.android.settings.biometrics.fingerprint.FingerprintUiHelper; +import com.android.settings.core.InstrumentedFragment; + +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 a7059da9ead..fd22b1e4062 100644 --- a/src/com/android/settings/password/ConfirmLockPassword.java +++ b/src/com/android/settings/password/ConfirmLockPassword.java @@ -16,7 +16,6 @@ package com.android.settings.password; -import android.app.Fragment; import android.app.admin.DevicePolicyManager; import android.content.Context; import android.content.Intent; @@ -51,6 +50,8 @@ 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/CredentialCheckResultTracker.java b/src/com/android/settings/password/CredentialCheckResultTracker.java index a17939c446c..1993ec6b64e 100644 --- a/src/com/android/settings/password/CredentialCheckResultTracker.java +++ b/src/com/android/settings/password/CredentialCheckResultTracker.java @@ -16,10 +16,11 @@ package com.android.settings.password; -import android.app.Fragment; import android.content.Intent; import android.os.Bundle; +import androidx.fragment.app.Fragment; + /** * An invisible retained fragment to track lock check result. */ diff --git a/src/com/android/settings/password/SaveChosenLockWorkerBase.java b/src/com/android/settings/password/SaveChosenLockWorkerBase.java index 95980e93e8b..f76ffd932b9 100644 --- a/src/com/android/settings/password/SaveChosenLockWorkerBase.java +++ b/src/com/android/settings/password/SaveChosenLockWorkerBase.java @@ -16,7 +16,6 @@ package com.android.settings.password; -import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.os.AsyncTask; @@ -25,6 +24,8 @@ import android.os.UserManager; import com.android.internal.widget.LockPatternUtils; +import androidx.fragment.app.Fragment; + /** * 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/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java index 190cc0ff381..9384236d204 100644 --- a/src/com/android/settings/password/SetupChooseLockGeneric.java +++ b/src/com/android/settings/password/SetupChooseLockGeneric.java @@ -36,7 +36,6 @@ import com.android.settings.utils.SettingsDividerItemDecoration; import com.android.setupwizardlib.GlifPreferenceLayout; import androidx.preference.Preference; -import androidx.preference.PreferenceFragment; import androidx.recyclerview.widget.RecyclerView; /** diff --git a/src/com/android/settings/password/SetupChooseLockPassword.java b/src/com/android/settings/password/SetupChooseLockPassword.java index f900e9a7838..56c6a7b3b3c 100644 --- a/src/com/android/settings/password/SetupChooseLockPassword.java +++ b/src/com/android/settings/password/SetupChooseLockPassword.java @@ -17,7 +17,6 @@ package com.android.settings.password; import android.app.Activity; -import android.app.Fragment; import android.app.admin.DevicePolicyManager; import android.content.Context; import android.content.Intent; @@ -32,6 +31,7 @@ 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 diff --git a/src/com/android/settings/password/SetupChooseLockPattern.java b/src/com/android/settings/password/SetupChooseLockPattern.java index 26e19909637..cc1633a16f3 100644 --- a/src/com/android/settings/password/SetupChooseLockPattern.java +++ b/src/com/android/settings/password/SetupChooseLockPattern.java @@ -16,7 +16,6 @@ package com.android.settings.password; -import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -29,6 +28,7 @@ import com.android.settings.R; import com.android.settings.SetupRedactionInterstitial; import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; /** * Setup Wizard's version of ChooseLockPattern screen. It inherits the logic and basic structure diff --git a/src/com/android/settings/password/SetupSkipDialog.java b/src/com/android/settings/password/SetupSkipDialog.java index fff6ad107ee..98a2482ab12 100644 --- a/src/com/android/settings/password/SetupSkipDialog.java +++ b/src/com/android/settings/password/SetupSkipDialog.java @@ -19,7 +19,6 @@ package com.android.settings.password; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; -import android.app.FragmentManager; import android.content.DialogInterface; import android.os.Bundle; @@ -28,6 +27,7 @@ import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import androidx.annotation.NonNull; +import androidx.fragment.app.FragmentManager; public class SetupSkipDialog extends InstrumentedDialogFragment implements DialogInterface.OnClickListener { diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java index a47bb978e9f..e05bea6cb0e 100644 --- a/src/com/android/settings/print/PrintServiceSettingsFragment.java +++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java @@ -17,12 +17,10 @@ package com.android.settings.print; import android.app.Activity; -import android.app.LoaderManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.IntentSender.SendIntentException; -import android.content.Loader; import android.content.pm.ResolveInfo; import android.database.DataSetObserver; import android.graphics.Color; @@ -70,6 +68,9 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; + /** * Fragment with print service settings. */ diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java index dd976678ffc..844f9f19a6b 100644 --- a/src/com/android/settings/print/PrintSettingsFragment.java +++ b/src/com/android/settings/print/PrintSettingsFragment.java @@ -18,13 +18,10 @@ package com.android.settings.print; import static com.android.settings.print.PrintSettingPreferenceController.shouldShowToUser; -import android.app.LoaderManager.LoaderCallbacks; import android.content.ActivityNotFoundException; -import android.content.AsyncTaskLoader; import android.content.ComponentName; import android.content.Context; import android.content.Intent; -import android.content.Loader; import android.content.pm.PackageManager; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; @@ -61,6 +58,9 @@ import java.text.DateFormat; import java.util.ArrayList; import java.util.List; +import androidx.loader.app.LoaderManager.LoaderCallbacks; +import androidx.loader.content.AsyncTaskLoader; +import androidx.loader.content.Loader; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; diff --git a/src/com/android/settings/search/actionbar/SearchMenuController.java b/src/com/android/settings/search/actionbar/SearchMenuController.java index 1729ccdb39a..a3bb2344cfa 100644 --- a/src/com/android/settings/search/actionbar/SearchMenuController.java +++ b/src/com/android/settings/search/actionbar/SearchMenuController.java @@ -17,7 +17,6 @@ package com.android.settings.search.actionbar; import android.annotation.NonNull; -import android.app.Fragment; import android.content.Intent; import android.os.Bundle; import android.view.Menu; @@ -32,6 +31,8 @@ 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/OwnerInfoPreferenceController.java b/src/com/android/settings/security/OwnerInfoPreferenceController.java index 19b1dd18556..a462916ac98 100644 --- a/src/com/android/settings/security/OwnerInfoPreferenceController.java +++ b/src/com/android/settings/security/OwnerInfoPreferenceController.java @@ -15,7 +15,6 @@ */ package com.android.settings.security; -import android.app.Fragment; import android.content.Context; import android.os.UserHandle; @@ -31,6 +30,7 @@ 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; diff --git a/src/com/android/settings/security/UnificationConfirmationDialog.java b/src/com/android/settings/security/UnificationConfirmationDialog.java index 95f252843cc..f82ece6def1 100644 --- a/src/com/android/settings/security/UnificationConfirmationDialog.java +++ b/src/com/android/settings/security/UnificationConfirmationDialog.java @@ -18,7 +18,6 @@ package com.android.settings.security; import android.app.AlertDialog; import android.app.Dialog; -import android.app.FragmentManager; import android.content.DialogInterface; import android.os.Bundle; @@ -26,6 +25,8 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +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/screenlock/LockAfterTimeoutPreferenceController.java b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java index af1c01a2089..f6db1801787 100644 --- a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java +++ b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java @@ -27,8 +27,8 @@ import android.util.Log; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; -import com.android.settings.display.TimeoutListPreference; import com.android.settings.core.PreferenceControllerMixin; +import com.android.settings.display.TimeoutListPreference; import com.android.settings.overlay.FeatureFactory; import com.android.settings.security.trustagent.TrustAgentManager; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/security/screenlock/ScreenLockSettings.java b/src/com/android/settings/security/screenlock/ScreenLockSettings.java index 6c6e862f63c..ec147d4fe25 100644 --- a/src/com/android/settings/security/screenlock/ScreenLockSettings.java +++ b/src/com/android/settings/security/screenlock/ScreenLockSettings.java @@ -16,7 +16,6 @@ package com.android.settings.security.screenlock; -import android.app.Fragment; import android.content.Context; import android.os.UserHandle; import android.provider.SearchIndexableResource; @@ -35,6 +34,8 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; +import androidx.fragment.app.Fragment; + @SearchIndexable public class ScreenLockSettings extends DashboardFragment implements OwnerInfoPreferenceController.OwnerInfoCallback { diff --git a/src/com/android/settings/support/actionbar/HelpMenuController.java b/src/com/android/settings/support/actionbar/HelpMenuController.java index 1188fc2bb1a..8ea98aa8d66 100644 --- a/src/com/android/settings/support/actionbar/HelpMenuController.java +++ b/src/com/android/settings/support/actionbar/HelpMenuController.java @@ -20,7 +20,6 @@ import static com.android.settings.support.actionbar.HelpResourceProvider.HELP_U import android.annotation.NonNull; import android.app.Activity; -import android.app.Fragment; import android.os.Bundle; import android.view.Menu; import android.view.MenuInflater; @@ -31,6 +30,8 @@ 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 552ed92953b..ab2e21a76cb 100644 --- a/src/com/android/settings/survey/SurveyMixin.java +++ b/src/com/android/settings/survey/SurveyMixin.java @@ -16,7 +16,6 @@ package com.android.settings.survey; import android.app.Activity; -import android.app.Fragment; import android.content.BroadcastReceiver; import com.android.settings.overlay.FeatureFactory; @@ -25,6 +24,8 @@ 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/users/AutoSyncDataPreferenceController.java b/src/com/android/settings/users/AutoSyncDataPreferenceController.java index c1f0e28638c..7d840caa6d0 100644 --- a/src/com/android/settings/users/AutoSyncDataPreferenceController.java +++ b/src/com/android/settings/users/AutoSyncDataPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.users; import android.app.ActivityManager; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; @@ -34,6 +33,7 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.SwitchPreference; diff --git a/src/com/android/settings/users/AutoSyncPersonalDataPreferenceController.java b/src/com/android/settings/users/AutoSyncPersonalDataPreferenceController.java index 79099adc2b2..2530977a3d9 100644 --- a/src/com/android/settings/users/AutoSyncPersonalDataPreferenceController.java +++ b/src/com/android/settings/users/AutoSyncPersonalDataPreferenceController.java @@ -15,10 +15,11 @@ */ package com.android.settings.users; -import android.app.Fragment; import android.content.Context; import android.os.UserHandle; +import androidx.fragment.app.Fragment; + public class AutoSyncPersonalDataPreferenceController extends AutoSyncDataPreferenceController { private static final String TAG = "AutoSyncPersonalData"; diff --git a/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java b/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java index 5e8ad2cf9d8..de7c24aa8fb 100644 --- a/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java +++ b/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java @@ -15,12 +15,13 @@ */ package com.android.settings.users; -import android.app.Fragment; import android.content.Context; import android.os.UserHandle; import com.android.settings.Utils; +import androidx.fragment.app.Fragment; + 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 315ebcb4adc..072c8cddb2c 100644 --- a/src/com/android/settings/users/EditUserInfoController.java +++ b/src/com/android/settings/users/EditUserInfoController.java @@ -19,7 +19,6 @@ package com.android.settings.users; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.UserInfo; @@ -42,6 +41,8 @@ import com.android.settingslib.drawable.CircleFramedDrawable; import java.io.File; +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 d24815eb3c8..4685bb15b3d 100644 --- a/src/com/android/settings/users/EditUserPhotoController.java +++ b/src/com/android/settings/users/EditUserPhotoController.java @@ -17,7 +17,6 @@ package com.android.settings.users; import android.app.Activity; -import android.app.Fragment; import android.content.ClipData; import android.content.ContentResolver; import android.content.Context; @@ -65,6 +64,7 @@ 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/OwnerInfoSettings.java b/src/com/android/settings/users/OwnerInfoSettings.java index 582431f3439..0f99360aa28 100644 --- a/src/com/android/settings/users/OwnerInfoSettings.java +++ b/src/com/android/settings/users/OwnerInfoSettings.java @@ -18,7 +18,6 @@ package com.android.settings.users; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.os.Bundle; @@ -34,6 +33,8 @@ import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.security.OwnerInfoPreferenceController.OwnerInfoCallback; +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/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java index 7a78fc94426..87c6b8e0da9 100644 --- a/src/com/android/settings/utils/ManagedServiceSettings.java +++ b/src/com/android/settings/utils/ManagedServiceSettings.java @@ -20,7 +20,6 @@ import android.annotation.Nullable; import android.app.ActivityManager; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; import android.app.admin.DevicePolicyManager; import android.content.ComponentName; import android.content.Context; @@ -44,6 +43,7 @@ import com.android.settingslib.applications.ServiceListing; import java.util.List; +import androidx.fragment.app.Fragment; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; diff --git a/src/com/android/settings/vpn2/AppDialogFragment.java b/src/com/android/settings/vpn2/AppDialogFragment.java index f8e6af0535f..2f7a6bb0f7e 100644 --- a/src/com/android/settings/vpn2/AppDialogFragment.java +++ b/src/com/android/settings/vpn2/AppDialogFragment.java @@ -18,7 +18,6 @@ package com.android.settings.vpn2; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; import android.content.Context; import android.content.DialogInterface; import android.content.pm.PackageInfo; @@ -35,6 +34,8 @@ import com.android.internal.net.VpnConfig; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +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 f0908fb5bdd..bdeb3f01c82 100644 --- a/src/com/android/settings/vpn2/AppManagementFragment.java +++ b/src/com/android/settings/vpn2/AppManagementFragment.java @@ -21,7 +21,6 @@ import android.annotation.NonNull; import android.app.AlertDialog; import android.app.AppOpsManager; import android.app.Dialog; -import android.app.DialogFragment; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; @@ -50,6 +49,7 @@ import com.android.settingslib.RestrictedSwitchPreference; import java.util.List; +import androidx.fragment.app.DialogFragment; import androidx.preference.Preference; public class AppManagementFragment extends SettingsPreferenceFragment diff --git a/src/com/android/settings/vpn2/ConfirmLockdownFragment.java b/src/com/android/settings/vpn2/ConfirmLockdownFragment.java index d4b26776eb4..5c2c9d7b51e 100644 --- a/src/com/android/settings/vpn2/ConfirmLockdownFragment.java +++ b/src/com/android/settings/vpn2/ConfirmLockdownFragment.java @@ -17,7 +17,6 @@ package com.android.settings.vpn2; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; import android.content.DialogInterface; import android.os.Bundle; @@ -25,6 +24,8 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +import androidx.fragment.app.Fragment; + public class ConfirmLockdownFragment extends InstrumentedDialogFragment implements DialogInterface.OnClickListener { public interface ConfirmLockdownListener { diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java index 9b2edff4fb6..6eaa9b2aab8 100644 --- a/src/com/android/settings/widget/EntityHeaderController.java +++ b/src/com/android/settings/widget/EntityHeaderController.java @@ -23,7 +23,6 @@ import android.annotation.IdRes; import android.annotation.UserIdInt; import android.app.ActionBar; import android.app.Activity; -import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.content.pm.PackageInfo; @@ -54,6 +53,7 @@ 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 { diff --git a/src/com/android/settings/wifi/LongPressAccessPointPreference.java b/src/com/android/settings/wifi/LongPressAccessPointPreference.java index 790e5701713..579d8487b7c 100644 --- a/src/com/android/settings/wifi/LongPressAccessPointPreference.java +++ b/src/com/android/settings/wifi/LongPressAccessPointPreference.java @@ -15,12 +15,12 @@ */ package com.android.settings.wifi; -import android.app.Fragment; 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; public class LongPressAccessPointPreference extends AccessPointPreference { diff --git a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java index 0b397db5eef..df24c42140f 100644 --- a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java +++ b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java @@ -1,7 +1,6 @@ package com.android.settings.wifi; import android.app.Activity; -import android.app.Fragment; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; @@ -25,6 +24,7 @@ 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; diff --git a/src/com/android/settings/wifi/WifiPickerActivity.java b/src/com/android/settings/wifi/WifiPickerActivity.java index ccac31e0457..d035a807aca 100644 --- a/src/com/android/settings/wifi/WifiPickerActivity.java +++ b/src/com/android/settings/wifi/WifiPickerActivity.java @@ -22,8 +22,6 @@ import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.wifi.p2p.WifiP2pSettings; -import androidx.preference.PreferenceFragment; - 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 2c0d0d5713d..704c6fd6fe6 100644 --- a/src/com/android/settings/wifi/WifiScanModeActivity.java +++ b/src/com/android/settings/wifi/WifiScanModeActivity.java @@ -19,7 +19,6 @@ package com.android.settings.wifi; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; -import android.app.DialogFragment; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -32,6 +31,8 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +import androidx.fragment.app.DialogFragment; + /** * This activity requests users permission to allow scanning even when Wi-Fi is turned off */ diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java index 4e35092c5bc..6379caf5492 100644 --- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java +++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.wifi; import static com.android.settings.wifi.ConfigureWifiSettings.WIFI_WAKEUP_REQUEST_CODE; -import android.app.Fragment; import android.app.Service; import android.content.Context; import android.content.Intent; @@ -33,6 +32,7 @@ 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; diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettings.java b/src/com/android/settings/wifi/calling/WifiCallingSettings.java index 0a16eaacbfd..ec27bac2f65 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSettings.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSettings.java @@ -16,8 +16,6 @@ package com.android.settings.wifi.calling; -import android.app.Fragment; -import android.app.FragmentManager; import android.os.Bundle; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; @@ -38,6 +36,8 @@ import com.android.settings.widget.SlidingTabLayout; import java.util.List; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; import androidx.legacy.app.FragmentPagerAdapter; /** diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java index e5dae7a1151..d01b82f5115 100644 --- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java @@ -20,7 +20,6 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED; import static android.net.NetworkCapabilities.TRANSPORT_WIFI; import android.app.Activity; -import android.app.Fragment; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -73,6 +72,7 @@ import java.util.StringJoiner; import java.util.stream.Collectors; import androidx.core.text.BidiFormatter; +import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; diff --git a/tests/anomaly-tester/src/com/android/settings/anomaly/tester/AnomalyActivity.java b/tests/anomaly-tester/src/com/android/settings/anomaly/tester/AnomalyActivity.java index e4567c2fbc3..385ee0c73ce 100644 --- a/tests/anomaly-tester/src/com/android/settings/anomaly/tester/AnomalyActivity.java +++ b/tests/anomaly-tester/src/com/android/settings/anomaly/tester/AnomalyActivity.java @@ -20,7 +20,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.ResultReceiver; import android.provider.Settings; -import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.EditText; diff --git a/tests/robotests/src/com/android/settings/HelpTrampolineTest.java b/tests/robotests/src/com/android/settings/HelpTrampolineTest.java index 23639ff70ea..2c7a8b96d42 100644 --- a/tests/robotests/src/com/android/settings/HelpTrampolineTest.java +++ b/tests/robotests/src/com/android/settings/HelpTrampolineTest.java @@ -17,7 +17,6 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; -import static org.robolectric.Shadows.shadowOf; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MasterClearTest.java index 64dab16118c..94365ef626f 100644 --- a/tests/robotests/src/com/android/settings/MasterClearTest.java +++ b/tests/robotests/src/com/android/settings/MasterClearTest.java @@ -17,7 +17,6 @@ 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; import static org.mockito.Mockito.doReturn; @@ -28,7 +27,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.robolectric.Shadows.shadowOf; import android.accounts.Account; import android.accounts.AccountManager; diff --git a/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java b/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java index 6386701ea53..8e4749aee4d 100644 --- a/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java @@ -21,7 +21,6 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.robolectric.RuntimeEnvironment.application; -import static org.robolectric.Shadows.shadowOf; import android.app.KeyguardManager; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/SettingsActivityTest.java b/tests/robotests/src/com/android/settings/SettingsActivityTest.java index 254d0ae3efd..37d8bc571fe 100644 --- a/tests/robotests/src/com/android/settings/SettingsActivityTest.java +++ b/tests/robotests/src/com/android/settings/SettingsActivityTest.java @@ -24,8 +24,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.ActivityManager; -import android.app.FragmentManager; -import android.app.FragmentTransaction; import android.content.Intent; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,6 +35,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +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 c9fd59aeb71..f9409f4b5cd 100644 --- a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java @@ -21,7 +21,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Dialog; -import android.app.Fragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -32,6 +31,8 @@ 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/SettingsLicenseActivityTest.java b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java index 0e1384ddd71..c736ae122a0 100644 --- a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java +++ b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java @@ -21,7 +21,6 @@ import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; -import static org.robolectric.Shadows.shadowOf; import android.app.Application; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java index 880cb9fa595..ef67f656678 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java @@ -18,7 +18,6 @@ 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; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java index 5295685935f..947a82dddc5 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java @@ -20,7 +20,6 @@ import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.robolectric.Shadows.shadowOf; import android.accounts.Account; import android.app.Activity; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java index 5567db18bd7..06f26ba704a 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java @@ -46,7 +46,6 @@ import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import androidx.lifecycle.LifecycleOwner; -import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; @RunWith(SettingsRobolectricTestRunner.class) diff --git a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java index 4a3782121b9..880639c3360 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java @@ -45,7 +45,6 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; import androidx.preference.Preference; -import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java index 311feade8c1..b1c1646284d 100644 --- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java @@ -30,8 +30,6 @@ import android.accounts.AccountManager; import android.accounts.AccountManagerCallback; import android.accounts.AuthenticatorDescription; import android.app.Activity; -import android.app.FragmentManager; -import android.app.FragmentTransaction; import android.content.ComponentName; import android.content.Context; import android.os.Bundle; @@ -60,7 +58,8 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -import androidx.preference.PreferenceFragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; 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 3073ee3bc0b..d9465bd9e87 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java @@ -26,7 +26,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.AppOpsManager; -import android.app.LoaderManager; import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; @@ -51,6 +50,7 @@ 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; 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 cb2f3a0315d..de2479adf9f 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java @@ -33,7 +33,6 @@ import static org.mockito.Mockito.when; import android.app.ActivityManager; import android.app.Application; -import android.app.Fragment; import android.app.admin.DevicePolicyManager; import android.content.Context; import android.content.Intent; @@ -63,6 +62,8 @@ import org.mockito.stubbing.Answer; import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; +import androidx.fragment.app.Fragment; + @RunWith(RobolectricTestRunner.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 91d76ac0334..ae9e429245d 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java @@ -27,7 +27,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.LoaderManager; import android.content.Context; import android.content.pm.ApplicationInfo; import android.net.ConnectivityManager; @@ -47,6 +46,7 @@ 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) 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 6f36879cc34..28cf982b1a1 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java @@ -21,7 +21,6 @@ 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; -import static org.mockito.Mockito.spy; 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/applications/appinfo/AppSettingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java index 1c5863c17c8..e6d377143a7 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; -import static org.robolectric.Shadows.shadowOf; import android.app.Application; import android.content.Intent; 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 76aa9a97c1e..3cb48b67f9a 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.LoaderManager; import android.content.Context; import android.content.pm.ApplicationInfo; import android.os.Bundle; @@ -41,6 +40,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.loader.app.LoaderManager; import androidx.preference.Preference; @RunWith(SettingsRobolectricTestRunner.class) 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 ae6ba1d8146..d73f3a6b39e 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java @@ -20,10 +20,8 @@ import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.robolectric.Shadows.shadowOf; import android.app.AlertDialog; -import android.app.Fragment; import android.content.Context; import android.content.DialogInterface; @@ -40,6 +38,8 @@ import org.robolectric.shadows.ShadowAlertDialog; import org.robolectric.shadows.ShadowDialog; import org.robolectric.util.FragmentTestUtil; +import androidx.fragment.app.Fragment; + @RunWith(SettingsRobolectricTestRunner.class) public class ButtonActionDialogFragmentTest { 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 7b1989baab4..dfe0dbce103 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.robolectric.Shadows.shadowOf; import android.app.AlertDialog; import android.content.Context; 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 98e436ec618..45fee32cf0b 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java @@ -27,8 +27,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.FragmentManager; -import android.app.FragmentTransaction; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -58,6 +56,8 @@ 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; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java index 776235c811c..13295e36638 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java @@ -21,7 +21,6 @@ import static org.mockito.Matchers.nullable; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.os.UserHandle; @@ -43,6 +42,8 @@ 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 fc8f272f3d0..8f2fb65eddf 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java @@ -21,7 +21,6 @@ import static org.mockito.Matchers.nullable; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.os.UserHandle; @@ -42,6 +41,8 @@ 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/backup/BackupSettingsActivityTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java index cd0ba792223..937616d4d94 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java @@ -23,12 +23,8 @@ import static org.mockito.Matchers.isA; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.robolectric.Shadows.shadowOf; import android.app.Application; -import android.app.Fragment; -import android.app.FragmentManager; -import android.app.FragmentTransaction; import android.content.ComponentName; import android.content.Intent; import android.content.pm.PackageManager; @@ -55,6 +51,10 @@ 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/biometrics/face/FaceStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java index df01acab0c1..bde1c3eeca0 100644 --- a/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java @@ -18,9 +18,7 @@ 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; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java index 17d46a87fe4..78af1d12c51 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java @@ -24,8 +24,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.FragmentManager; -import android.app.FragmentTransaction; import android.view.View; import android.widget.Button; @@ -41,6 +39,9 @@ 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 9ef3499d7b3..e9cb562cdef 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java @@ -32,7 +32,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.annotation.Config; -import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; @RunWith(SettingsRobolectricTestRunner.class) diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java index 0389d8cf7f1..3860617200d 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java @@ -24,9 +24,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.Fragment; -import android.app.FragmentManager; -import android.app.FragmentTransaction; import android.graphics.drawable.Drawable; import android.view.View; @@ -49,6 +46,10 @@ 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/BluetoothDeviceRenamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java index 31045a62085..2b5c7e911bf 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java @@ -24,8 +24,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.Fragment; -import android.app.FragmentTransaction; import android.content.Context; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,6 +37,8 @@ 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; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java index b28a8b2b825..8da659e1cae 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java @@ -16,7 +16,6 @@ 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/ForgetDeviceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java index c9a93acf50e..f3b077ed378 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java @@ -16,7 +16,6 @@ package com.android.settings.bluetooth; -import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java index 13c5d82f219..ed0d9467696 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java @@ -18,7 +18,6 @@ package com.android.settings.connecteddevice; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.spy; -import static org.robolectric.Shadows.shadowOf; import android.content.ContentResolver; import android.content.Context; 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 7317ea99216..06e752215da 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiverTest.java @@ -16,7 +16,6 @@ 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/UsbDetailsPowerRoleControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java index 2bc0ed965af..6a540f06f83 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java @@ -17,7 +17,6 @@ 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; @@ -28,10 +27,6 @@ import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; import android.os.Handler; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -44,7 +39,11 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; + +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/SubSettingLauncherTest.java b/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java index 81ec1155f6d..aabcdf2ab1b 100644 --- a/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java +++ b/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java @@ -26,7 +26,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; -import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.os.UserHandle; @@ -43,6 +42,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.fragment.app.Fragment; + @RunWith(SettingsRobolectricTestRunner.class) public class SubSettingLauncherTest { 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 59082792e80..36c3ae7cc93 100644 --- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java +++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java @@ -18,7 +18,6 @@ package com.android.settings.core.instrumentation; import static com.google.common.truth.Truth.assertWithMessage; -import android.app.Fragment; import android.util.ArraySet; import com.android.settings.core.codeinspection.CodeInspector; @@ -28,6 +27,8 @@ 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/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java index 7228a2fde72..c8ed6705db9 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java @@ -30,7 +30,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static org.robolectric.Shadows.shadowOf; import android.app.Activity; import android.content.ComponentName; @@ -43,7 +42,7 @@ import android.graphics.drawable.Icon; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -59,7 +58,6 @@ import com.android.settingslib.drawer.DashboardCategory; import com.android.settingslib.drawer.Tile; import com.android.settingslib.drawer.TileUtils; -import java.util.ArrayList; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -73,6 +71,10 @@ import org.robolectric.shadows.ShadowActivity; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; +import java.util.ArrayList; + +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowUserManager.class) public class DashboardFeatureProviderImplTest { diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java index 83579b4252c..69cb0817fa2 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java @@ -16,7 +16,6 @@ package com.android.settings.dashboard; -import android.app.Fragment; import android.content.Context; import com.android.settings.core.BasePreferenceController; @@ -29,6 +28,8 @@ 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/conditional/BackgroundDataConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java index 725be7962d4..47eeaaf2e6d 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java @@ -15,7 +15,6 @@ */ package com.android.settings.dashboard.conditional; -import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java index ffda30d8379..0c14d62889e 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.app.Activity; -import android.app.Fragment; import android.widget.Filter; import android.widget.LinearLayout; @@ -47,6 +46,8 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; +import androidx.fragment.app.Fragment; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { RegionSearchPickerTest.ShadowBaseTimeZonePicker.class, diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java index 0359cfcd7ae..d388dcda6a8 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 @@ -22,14 +22,14 @@ import static org.mockito.Mockito.when; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - import libcore.util.CountryTimeZones; import libcore.util.CountryTimeZones.TimeZoneMapping; import libcore.util.CountryZonesFinder; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java index 14a6211e0e0..f78d8f955b2 100644 --- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java @@ -23,8 +23,6 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import android.app.Fragment; -import android.app.FragmentManager; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; @@ -43,6 +41,8 @@ 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) diff --git a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java index 05f482425cb..6c7c1ebba1b 100644 --- a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.Fragment; import android.content.Context; import android.hardware.usb.IUsbManager; import android.os.RemoteException; @@ -46,6 +45,7 @@ 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; diff --git a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java index 8889ed1e77d..fb0ed7945a9 100644 --- a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java @@ -27,7 +27,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; -import android.app.FragmentManager; import android.content.Context; import android.content.res.Resources; import android.os.UserManager; @@ -44,6 +43,7 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.fragment.app.FragmentManager; import androidx.preference.PreferenceScreen; @RunWith(SettingsRobolectricTestRunner.class) diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPersistentTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPersistentTest.java index c9f452de7d6..bf0cf091fa0 100644 --- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPersistentTest.java +++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPersistentTest.java @@ -17,22 +17,18 @@ package com.android.settings.development.featureflags; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.development.featureflags.FeatureFlagPersistent; +import android.content.Context; +import android.os.SystemProperties; +import android.provider.Settings; +import android.util.FeatureFlagUtils; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; - -import android.content.Context; -import android.os.SystemProperties; -import android.provider.Settings; -import android.util.FeatureFlagUtils; -import android.util.Log; @RunWith(SettingsRobolectricTestRunner.class) public class FeatureFlagPersistentTest { 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..65d4e3bd288 100644 --- a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java +++ b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java @@ -18,7 +18,6 @@ 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; import android.content.ComponentName; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java index 3aa3ce211ec..22344145fc9 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import android.app.Activity; -import android.app.Fragment; import android.content.Context; import android.os.Build; import android.os.Process; @@ -52,6 +51,7 @@ 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; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java index dbffc3182e1..78eb0309740 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java @@ -22,9 +22,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.Fragment; -import android.app.FragmentManager; -import android.app.FragmentTransaction; import android.content.Context; import android.os.Build; @@ -40,6 +37,9 @@ 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; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java index 343f28317eb..323a1165c0b 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java @@ -19,7 +19,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; -import android.app.Fragment; import android.content.Context; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -31,6 +30,7 @@ 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; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java index ec371facd18..8ac9925b7da 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java @@ -17,7 +17,6 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; -import static org.robolectric.Shadows.shadowOf; import android.content.ComponentName; import android.content.Intent; 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 bf049bcddde..512062cee5b 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java @@ -18,7 +18,6 @@ package com.android.settings.deviceinfo.firmwareversion; import static com.google.common.truth.Truth.assertThat; -import android.app.Fragment; import android.content.Context; import android.os.Build; @@ -37,6 +36,7 @@ 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; 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 0dad2d14a39..d1056b58999 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java @@ -25,8 +25,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.Fragment; -import android.app.FragmentManager; import android.content.Context; import android.os.UserManager; import android.telephony.TelephonyManager; @@ -43,6 +41,8 @@ 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; 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 0d1fef0a69b..7846292c3b3 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java @@ -23,8 +23,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.Fragment; -import android.app.FragmentManager; import android.content.Context; import android.os.UserManager; import android.telephony.TelephonyManager; @@ -41,6 +39,8 @@ 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; 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 92e7d7cad56..e206d521cee 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java @@ -25,8 +25,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.FragmentManager; -import android.app.FragmentTransaction; import android.content.ContentResolver; import android.content.Context; import android.os.SystemProperties; @@ -50,6 +48,8 @@ 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; 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 44415bdc4e7..e41333aeb90 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java @@ -30,9 +30,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; -import android.app.Fragment; -import android.app.FragmentManager; -import android.app.FragmentTransaction; import android.content.Context; import android.content.Intent; import android.graphics.drawable.Drawable; @@ -65,6 +62,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import androidx.preference.PreferenceScreen; @RunWith(SettingsRobolectricTestRunner.class) diff --git a/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java index c5d6f18be64..21f3c0aa069 100644 --- a/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java @@ -23,13 +23,11 @@ import static org.mockito.Mockito.when; import android.app.UiModeManager; import android.content.Context; -import com.android.settings.display.DarkUIPreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java b/tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java index 0e40fb52b47..40a59759999 100644 --- a/tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java @@ -16,11 +16,9 @@ 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; -import android.text.TextUtils; import android.util.AttributeSet; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java index 0447bbbcfac..a575a60c435 100644 --- a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java @@ -19,7 +19,6 @@ 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.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java index b12b99a7b5e..8eadedfa559 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java @@ -32,7 +32,6 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.app.AppOpsManager; -import android.app.LoaderManager; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -75,6 +74,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; +import androidx.loader.app.LoaderManager; import androidx.preference.Preference; import androidx.recyclerview.widget.RecyclerView; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java index 76b9ef0e42c..10fe14e55a3 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java @@ -26,7 +26,6 @@ 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 static org.robolectric.Shadows.shadowOf; import android.app.Activity; import android.content.Context; @@ -55,7 +54,6 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowPowerManager; import androidx.lifecycle.LifecycleOwner; -import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; import androidx.recyclerview.widget.RecyclerView; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java index eb683c072e0..4b96a4d5452 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import android.app.LoaderManager; import android.content.Context; import android.os.Bundle; @@ -40,6 +39,8 @@ 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/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java index 47798189689..22b042ea09a 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java @@ -31,7 +31,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.LoaderManager; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -72,6 +71,8 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; +import androidx.loader.app.LoaderManager; + // TODO: Improve this test class so that it starts up the real activity and fragment. @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java index 321fda55e60..a375bf48f4f 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java @@ -20,7 +20,6 @@ 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; -import static org.robolectric.Shadows.shadowOf; import android.app.AlertDialog; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java index 831b07cb353..27a67698d03 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java @@ -21,7 +21,6 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; -import static org.robolectric.Shadows.shadowOf; import android.app.AlertDialog; import android.content.Context; 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 4cf7220bfff..e6dea88fedb 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java @@ -22,8 +22,6 @@ import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.FragmentManager; -import android.app.FragmentTransaction; import android.content.Context; import com.android.settings.SettingsActivity; @@ -40,6 +38,8 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; 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 1ff663f9f90..9e99f6c5dc6 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java @@ -19,7 +19,6 @@ package com.android.settings.fuelgauge.batterytip; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; -import static org.robolectric.Shadows.shadowOf; import android.app.AlertDialog; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java index 836f458c752..0d6f9c55ba6 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java @@ -15,12 +15,9 @@ */ package com.android.settings.fuelgauge.batterytip.actions; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import android.app.AppOpsManager; -import android.content.Context; import android.util.Pair; import com.android.internal.logging.nano.MetricsProto; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java index 7fdf46a8f47..c44ae786bf3 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java @@ -15,8 +15,6 @@ */ package com.android.settings.fuelgauge.batterytip.actions; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import android.app.AppOpsManager; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java index d00cf875fa3..bcbcdff99c1 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,7 +17,6 @@ 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; @@ -30,7 +29,6 @@ import android.text.format.DateUtils; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; -import com.android.settings.fuelgauge.BatteryInfo; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java index 657a5e326b0..b5392bce463 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,7 +17,6 @@ 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 a8989a0962e..6ef4c74e828 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,7 +17,6 @@ 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/tips/BatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java index fa81300bcb6..ec048aa6953 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,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; -import androidx.annotation.IdRes; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -35,6 +33,9 @@ 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 752e3aba58b..f9e52d31b6e 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,7 +16,6 @@ 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 1ff21f8c9ef..f0c202c92c1 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,7 +16,6 @@ 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 359d2601f81..f623b9dc883 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,14 +16,12 @@ 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; import android.os.Parcel; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java index cab8913c17a..5c8b7d9acb7 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,7 +16,6 @@ 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; @@ -36,7 +35,6 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTipTest.java index 221c37fcbc7..4ca87570d6b 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,7 +16,6 @@ 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/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java index 7e977787cf3..59d31e2ffa2 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java @@ -41,7 +41,6 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java index f2cf2e0f73f..5db94aa2b65 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; -import android.app.Fragment; import android.content.Context; import android.hardware.input.InputDeviceIdentifier; import android.hardware.input.InputManager; @@ -45,6 +44,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; +import androidx.fragment.app.Fragment; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java index f97172e3b7b..7fc76282316 100644 --- a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java @@ -27,7 +27,6 @@ import static com.android.settings.notification.ConfigureNotificationSettings 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; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java index 0c9c6bec11d..7830e327185 100644 --- a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java @@ -43,8 +43,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.shadows.ShadowApplication; -import androidx.preference.PreferenceFragment; - @RunWith(SettingsRobolectricTestRunner.class) public class HeaderPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java index 4b5de03fd8c..8b1a134e4a2 100644 --- a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java @@ -31,7 +31,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; -import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -62,6 +61,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; +import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java index cf003a67a6a..63b0e31fd6a 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java @@ -21,7 +21,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.app.AutomaticZenRule; -import android.app.Fragment; import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; @@ -43,6 +42,7 @@ 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; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java index ab9b1cbf202..9450df0ff62 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.FragmentManager; import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; @@ -45,6 +44,7 @@ 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; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java index 26e1d48ae44..b748bcb9a9d 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java @@ -20,7 +20,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.FragmentManager; import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; @@ -39,6 +38,7 @@ 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; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java index 0ec4700ecdd..f7096f41afd 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import android.app.AlertDialog; -import android.app.Fragment; import android.content.Context; import com.android.settings.R; @@ -44,6 +43,8 @@ import org.robolectric.shadows.ShadowAlertDialog; import org.robolectric.shadows.ShadowDialog; import org.robolectric.util.FragmentTestUtil; +import androidx.fragment.app.Fragment; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowUserManager.class, ShadowUtils.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 73d8452dabb..02cb789b9ab 100644 --- a/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java +++ b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java @@ -19,7 +19,6 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; import android.app.Activity; -import android.app.FragmentManager; import com.android.settings.password.ConfirmDeviceCredentialBaseFragment.LastTryDialog; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -30,6 +29,8 @@ import org.junit.runner.RunWith; import org.robolectric.Robolectric; import org.robolectric.annotation.Config; +import androidx.fragment.app.FragmentManager; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) public class ConfirmCredentialTest { diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java index 9d72bd883da..4b54a599085 100644 --- a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java +++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java @@ -17,7 +17,6 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; -import static org.robolectric.Shadows.shadowOf; import android.content.ComponentName; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java index cef18741401..6c35a5b5d85 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java @@ -18,7 +18,6 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; import static org.robolectric.RuntimeEnvironment.application; -import static org.robolectric.Shadows.shadowOf; import android.app.AlertDialog; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java index d0a062b8adb..a667454156e 100644 --- a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java @@ -16,7 +16,6 @@ package com.android.settings.password; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import android.app.Activity; diff --git a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java index 05d76f1a749..c884001a3fe 100644 --- a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java @@ -26,8 +26,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.FragmentManager; -import android.app.FragmentTransaction; import android.content.Context; import com.android.internal.widget.LockPatternUtils; @@ -44,7 +42,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import androidx.preference.PreferenceFragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java index 45a0367b325..ea76ffa1bbc 100644 --- a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java @@ -33,7 +33,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.robolectric.Shadows.shadowOf; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; 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 d0c3373965b..009b8630d01 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java @@ -2,7 +2,6 @@ package com.android.settings.testutils.shadow; import static android.util.TypedValue.TYPE_REFERENCE; import static org.robolectric.RuntimeEnvironment.application; -import static org.robolectric.Shadows.shadowOf; import static org.robolectric.shadow.api.Shadow.directlyOn; import android.annotation.DimenRes; 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 0125b77fe29..4a7301504db 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityWithLoadManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityWithLoadManager.java @@ -17,12 +17,13 @@ package com.android.settings.testutils.shadow; import android.app.Activity; -import android.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/ShadowEntityHeaderController.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java index 4ec48d35dd2..2e96f8c2ce8 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java @@ -17,7 +17,6 @@ package com.android.settings.testutils.shadow; import android.app.Activity; -import android.app.Fragment; import android.view.View; import com.android.settings.widget.EntityHeaderController; @@ -26,6 +25,8 @@ 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/ShadowFragment.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java index 459655984d0..444ecabaf19 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 android.app.Fragment; -import android.app.FragmentManager; - import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; + /** * 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/users/AutoSyncDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java index 2cef7516937..cc19ad75ed0 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java @@ -20,7 +20,6 @@ import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; -import android.app.Fragment; import android.content.Context; import android.content.DialogInterface; import android.content.pm.UserInfo; @@ -39,6 +38,7 @@ 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; diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java index 10fd7c49cc7..c1f773de438 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java @@ -20,7 +20,6 @@ import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; -import android.app.Fragment; import android.content.Context; import android.content.pm.UserInfo; import android.os.UserManager; @@ -37,6 +36,7 @@ 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; diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java index 176d1b0492c..1eda713ff8d 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java @@ -21,7 +21,6 @@ import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.when; -import android.app.Fragment; import android.content.Context; import android.content.pm.UserInfo; import android.os.UserHandle; @@ -38,6 +37,8 @@ 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/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java index 89bf9a146a0..8035b1351b9 100644 --- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java +++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java @@ -26,18 +26,12 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.content.Context; -import android.content.pm.UserInfo; import android.content.SharedPreferences; +import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; import android.os.UserManager; import android.provider.Settings; -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.SettingsRobolectricTestRunner; @@ -53,6 +47,12 @@ import org.robolectric.Robolectric; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +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 f57402a73a4..da160fe4ea4 100644 --- a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java @@ -19,7 +19,6 @@ package com.android.settings.vpn2; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import android.app.Fragment; import android.content.pm.PackageInfo; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -30,6 +29,8 @@ 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/wallpaper/WallpaperSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java index fc708eff63b..64fc97b76eb 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java @@ -18,7 +18,6 @@ package com.android.settings.wallpaper; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; -import static org.robolectric.Shadows.shadowOf; import android.app.WallpaperManager; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java index d6f796015a3..9f6e7237261 100644 --- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java @@ -27,7 +27,6 @@ import static org.mockito.Mockito.when; import android.app.ActionBar; import android.app.Activity; -import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; @@ -57,6 +56,7 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.fragment.app.Fragment; import androidx.preference.Preference; @RunWith(SettingsRobolectricTestRunner.class) diff --git a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java index 77e18acae41..f74882b9700 100644 --- a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java +++ b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.robolectric.RuntimeEnvironment.application; -import static org.robolectric.Shadows.shadowOf; import android.graphics.Rect; import android.widget.FrameLayout; diff --git a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java index 26b102bba9a..3ba7c8ef13f 100644 --- a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java @@ -17,7 +17,6 @@ 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; diff --git a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java index 14611fac651..b4b5b94e5d0 100644 --- a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java @@ -28,7 +28,6 @@ import static org.mockito.Mockito.when; import android.annotation.NonNull; import android.app.Activity; -import android.app.Fragment; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -56,6 +55,7 @@ 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; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java index 65ca3e19241..995ad176d69 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java @@ -28,7 +28,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import android.app.AlertDialog; -import android.app.Fragment; import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; @@ -46,6 +45,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.fragment.app.Fragment; + @RunWith(SettingsRobolectricTestRunner.class) public class WifiScanningRequiredFragmentTest { diff --git a/tests/uitests/src/com/android/settings/ui/AccessibilitySettingsTests.java b/tests/uitests/src/com/android/settings/ui/AccessibilitySettingsTests.java index 83afa6583f8..2fdee5cfee4 100644 --- a/tests/uitests/src/com/android/settings/ui/AccessibilitySettingsTests.java +++ b/tests/uitests/src/com/android/settings/ui/AccessibilitySettingsTests.java @@ -16,8 +16,7 @@ package com.android.settings.ui; -import android.content.Context; -import android.net.wifi.WifiManager; +import android.metrics.MetricsReader; import android.os.RemoteException; import android.platform.test.annotations.Presubmit; import android.provider.Settings; @@ -32,7 +31,6 @@ import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.MediumTest; import android.test.suitebuilder.annotation.Suppress; -import android.metrics.MetricsReader; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; public class AccessibilitySettingsTests extends InstrumentationTestCase { diff --git a/tests/uitests/src/com/android/settings/ui/AppsSettingsTests.java b/tests/uitests/src/com/android/settings/ui/AppsSettingsTests.java index 6be49d6d1ca..81532b15b95 100644 --- a/tests/uitests/src/com/android/settings/ui/AppsSettingsTests.java +++ b/tests/uitests/src/com/android/settings/ui/AppsSettingsTests.java @@ -27,13 +27,8 @@ import android.support.test.uiautomator.Until; import android.system.helpers.ActivityHelper; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.MediumTest; -import android.text.TextUtils; import android.util.Log; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; - /** Verifies basic functionality of the About Phone screen */ public class AppsSettingsTests extends InstrumentationTestCase { private static final boolean LOCAL_LOGV = false; diff --git a/tests/uitests/src/com/android/settings/ui/ConnectedDeviceTests.java b/tests/uitests/src/com/android/settings/ui/ConnectedDeviceTests.java index 971d724d040..ca19a3f6572 100644 --- a/tests/uitests/src/com/android/settings/ui/ConnectedDeviceTests.java +++ b/tests/uitests/src/com/android/settings/ui/ConnectedDeviceTests.java @@ -16,6 +16,9 @@ package com.android.settings.ui; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import android.content.Context; import android.content.Intent; import android.nfc.NfcAdapter; @@ -34,9 +37,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - @MediumTest @RunWith(AndroidJUnit4.class) public class ConnectedDeviceTests { diff --git a/tests/uitests/src/com/android/settings/ui/DataUsageSettingsTests.java b/tests/uitests/src/com/android/settings/ui/DataUsageSettingsTests.java index 725ba5cf635..eddc7717a06 100644 --- a/tests/uitests/src/com/android/settings/ui/DataUsageSettingsTests.java +++ b/tests/uitests/src/com/android/settings/ui/DataUsageSettingsTests.java @@ -24,7 +24,6 @@ import android.support.test.uiautomator.Until; import android.system.helpers.SettingsHelper; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.Suppress; public class DataUsageSettingsTests extends InstrumentationTestCase { diff --git a/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTest2.java b/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTest2.java index 971c7d7c91b..c18583b0b57 100644 --- a/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTest2.java +++ b/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTest2.java @@ -19,7 +19,6 @@ package com.android.settings.ui; import android.content.Context; import android.net.wifi.WifiManager; import android.os.RemoteException; -import android.platform.test.annotations.Presubmit; import android.provider.Settings; import android.support.test.uiautomator.By; import android.support.test.uiautomator.BySelector; diff --git a/tests/uitests/src/com/android/settings/ui/NotificationSettingsTests.java b/tests/uitests/src/com/android/settings/ui/NotificationSettingsTests.java index 133332c2dac..e25005c28a0 100644 --- a/tests/uitests/src/com/android/settings/ui/NotificationSettingsTests.java +++ b/tests/uitests/src/com/android/settings/ui/NotificationSettingsTests.java @@ -27,10 +27,10 @@ import android.support.test.uiautomator.UiObject2; import android.support.test.uiautomator.Until; import android.system.helpers.ActivityHelper; import android.system.helpers.SettingsHelper; -import android.widget.ListView; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.MediumTest; import android.util.Log; +import android.widget.ListView; /** Verifies that you can get to the notification app listing page from the apps & notifications * page */ diff --git a/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java b/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java index 0aec505185e..9789c5fa720 100644 --- a/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java +++ b/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java @@ -16,19 +16,15 @@ package com.android.settings.ui; -import android.app.NotificationManager; import android.content.ContentResolver; -import android.content.Context; -import android.os.Handler; import android.os.SystemClock; import android.provider.Settings; -import android.service.notification.ZenModeConfig; -import android.support.test.uiautomator.UiObject2; -import android.system.helpers.SettingsHelper; -import android.system.helpers.SettingsHelper.SettingsType; import android.support.test.uiautomator.By; import android.support.test.uiautomator.UiDevice; +import android.support.test.uiautomator.UiObject2; import android.support.test.uiautomator.Until; +import android.system.helpers.SettingsHelper; +import android.system.helpers.SettingsHelper.SettingsType; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.MediumTest; import android.test.suitebuilder.annotation.Suppress; diff --git a/tests/uitests/src/com/android/settings/ui/SyncSettingsTest.java b/tests/uitests/src/com/android/settings/ui/SyncSettingsTest.java index 3dca424b2bd..848147f6aba 100644 --- a/tests/uitests/src/com/android/settings/ui/SyncSettingsTest.java +++ b/tests/uitests/src/com/android/settings/ui/SyncSettingsTest.java @@ -16,6 +16,8 @@ package com.android.settings.ui; +import static junit.framework.Assert.assertTrue; + import android.os.RemoteException; import android.provider.Settings; import android.support.test.InstrumentationRegistry; @@ -32,8 +34,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import static junit.framework.Assert.assertTrue; - @MediumTest @RunWith(AndroidJUnit4.class) public class SyncSettingsTest { diff --git a/tests/uitests/src/com/android/settings/ui/ZonePickerSettingsTest.java b/tests/uitests/src/com/android/settings/ui/ZonePickerSettingsTest.java index 049c0c3fed8..864b7a9be59 100644 --- a/tests/uitests/src/com/android/settings/ui/ZonePickerSettingsTest.java +++ b/tests/uitests/src/com/android/settings/ui/ZonePickerSettingsTest.java @@ -15,6 +15,12 @@ */ package com.android.settings.ui; +import static com.android.settings.ui.testutils.SettingsTestUtils.SETTINGS_PACKAGE; +import static com.android.settings.ui.testutils.SettingsTestUtils.TIMEOUT; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import android.os.RemoteException; import android.os.SystemProperties; import android.provider.Settings; @@ -40,12 +46,6 @@ import org.junit.runner.RunWith; import java.util.TimeZone; -import static com.android.settings.ui.testutils.SettingsTestUtils.SETTINGS_PACKAGE; -import static com.android.settings.ui.testutils.SettingsTestUtils.TIMEOUT; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - @MediumTest @RunWith(AndroidJUnit4.class) public class ZonePickerSettingsTest { diff --git a/tests/unit/src/com/android/settings/EncryptionInterstitialTest.java b/tests/unit/src/com/android/settings/EncryptionInterstitialTest.java index eb61b00958e..12610ccf1bd 100644 --- a/tests/unit/src/com/android/settings/EncryptionInterstitialTest.java +++ b/tests/unit/src/com/android/settings/EncryptionInterstitialTest.java @@ -19,7 +19,6 @@ package com.android.settings; import static android.support.test.espresso.Espresso.onView; import static android.support.test.espresso.action.ViewActions.click; import static android.support.test.espresso.matcher.ViewMatchers.withId; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/tests/unit/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java b/tests/unit/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java index b1d94d46a12..a8a6b7436fb 100644 --- a/tests/unit/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java +++ b/tests/unit/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java @@ -16,6 +16,13 @@ package com.android.settings; +import static android.support.test.espresso.Espresso.onView; +import static android.support.test.espresso.assertion.ViewAssertions.matches; +import static android.support.test.espresso.matcher.RootMatchers.isDialog; +import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; +import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static junit.framework.Assert.fail; + import android.app.Instrumentation; import android.app.UiAutomation; import android.content.Context; @@ -35,13 +42,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.RootMatchers.isDialog; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static junit.framework.Assert.fail; - @RunWith(AndroidJUnit4.class) @SmallTest public class RegulatoryInfoDisplayActivityTest { diff --git a/tests/unit/src/com/android/settings/SettingsHookTests.java b/tests/unit/src/com/android/settings/SettingsHookTests.java index cc7aa89981a..ee0bbb6e076 100644 --- a/tests/unit/src/com/android/settings/SettingsHookTests.java +++ b/tests/unit/src/com/android/settings/SettingsHookTests.java @@ -16,8 +16,6 @@ package com.android.settings; -import com.android.settings.Settings; - import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; diff --git a/tests/unit/src/com/android/settings/UserCredentialsTest.java b/tests/unit/src/com/android/settings/UserCredentialsTest.java index 8a72797e2cb..ad10e4451fe 100644 --- a/tests/unit/src/com/android/settings/UserCredentialsTest.java +++ b/tests/unit/src/com/android/settings/UserCredentialsTest.java @@ -16,13 +16,13 @@ package com.android.settings; +import static com.android.settings.UserCredentialsSettings.Credential; + import android.os.Parcel; import android.os.Process; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.SmallTest; -import static com.android.settings.UserCredentialsSettings.Credential; - /** * User credentials settings fragment tests * diff --git a/tests/unit/src/com/android/settings/UtilsTest.java b/tests/unit/src/com/android/settings/UtilsTest.java index 20e701350a4..5048fb5dd37 100644 --- a/tests/unit/src/com/android/settings/UtilsTest.java +++ b/tests/unit/src/com/android/settings/UtilsTest.java @@ -16,8 +16,6 @@ package com.android.settings; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNull; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.when; @@ -27,12 +25,12 @@ import android.os.UserManager; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; -import java.util.ArrayList; -import java.util.Arrays; - import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import java.util.ArrayList; +import java.util.Arrays; + public class UtilsTest extends AndroidTestCase { private static final int TEST_PRIMARY_USER_ID = 10; private static final int TEST_MANAGED_PROFILE_ID = 11; diff --git a/tests/unit/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java b/tests/unit/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java index 886f4f0f004..76d173d3ab8 100644 --- a/tests/unit/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java +++ b/tests/unit/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java @@ -16,22 +16,18 @@ package com.android.settings.accessibility; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.Matchers.allOf; -import static org.hamcrest.collection.IsIn.oneOf; - import static android.support.test.espresso.Espresso.onView; import static android.support.test.espresso.assertion.ViewAssertions.matches; import static android.support.test.espresso.matcher.ViewMatchers.hasDescendant; import static android.support.test.espresso.matcher.ViewMatchers.isChecked; import static android.support.test.espresso.matcher.ViewMatchers.isNotChecked; -import static android.support.test.espresso.matcher.ViewMatchers.withText; import static android.support.test.espresso.matcher.ViewMatchers.withParent; +import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.Matchers.allOf; -import android.app.Activity; import android.app.Instrumentation; -import android.content.Context; import android.os.Bundle; import android.provider.Settings; import android.support.test.InstrumentationRegistry; diff --git a/tests/unit/src/com/android/settings/accounts/AccountsSettingsTest.java b/tests/unit/src/com/android/settings/accounts/AccountsSettingsTest.java index 7218efe0a3e..5ee04083d8f 100644 --- a/tests/unit/src/com/android/settings/accounts/AccountsSettingsTest.java +++ b/tests/unit/src/com/android/settings/accounts/AccountsSettingsTest.java @@ -26,9 +26,9 @@ import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.UiObject; -import android.support.test.uiautomator.UiSelector; -import android.support.test.uiautomator.UiScrollable; import android.support.test.uiautomator.UiObjectNotFoundException; +import android.support.test.uiautomator.UiScrollable; +import android.support.test.uiautomator.UiSelector; import org.junit.Before; import org.junit.Test; diff --git a/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java b/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java index 8f53d0bf1b7..2ba855be3fa 100644 --- a/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java +++ b/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java @@ -15,8 +15,14 @@ */ package com.android.settings.applications; +import static android.app.AppOpsManager.MODE_ALLOWED; +import static android.app.AppOpsManager.MODE_DEFAULT; +import static android.app.AppOpsManager.MODE_ERRORED; import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import android.app.AppOpsManager; import android.content.Context; @@ -34,7 +40,6 @@ 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 androidx.recyclerview.widget.RecyclerView; import android.widget.Switch; import android.widget.TextView; @@ -44,12 +49,7 @@ import org.junit.Test; import java.util.List; -import static android.app.AppOpsManager.MODE_ALLOWED; -import static android.app.AppOpsManager.MODE_DEFAULT; -import static android.app.AppOpsManager.MODE_ERRORED; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import androidx.recyclerview.widget.RecyclerView; /** * An abstract parent for testing settings activities that manage an AppOps permission. diff --git a/tests/unit/src/com/android/settings/applications/ManageApplicationsLaunchTest.java b/tests/unit/src/com/android/settings/applications/ManageApplicationsLaunchTest.java index e074966eecb..a7518909401 100644 --- a/tests/unit/src/com/android/settings/applications/ManageApplicationsLaunchTest.java +++ b/tests/unit/src/com/android/settings/applications/ManageApplicationsLaunchTest.java @@ -16,6 +16,12 @@ package com.android.settings.applications; +import static android.support.test.espresso.Espresso.onView; +import static android.support.test.espresso.assertion.ViewAssertions.matches; +import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; +import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static org.hamcrest.Matchers.allOf; + import android.app.Instrumentation; import android.content.Intent; import android.provider.Settings; @@ -27,12 +33,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.withText; -import static org.hamcrest.Matchers.allOf; - @SmallTest @RunWith(AndroidJUnit4.class) public class ManageApplicationsLaunchTest { diff --git a/tests/unit/src/com/android/settings/backup/BackupIntentTest.java b/tests/unit/src/com/android/settings/backup/BackupIntentTest.java index 0762e8c33bd..ce611d04774 100644 --- a/tests/unit/src/com/android/settings/backup/BackupIntentTest.java +++ b/tests/unit/src/com/android/settings/backup/BackupIntentTest.java @@ -16,6 +16,8 @@ package com.android.settings.backup; +import static com.google.common.truth.Truth.assertThat; + import android.app.Instrumentation; import android.content.Context; import android.content.Intent; @@ -31,8 +33,6 @@ import org.junit.runner.RunWith; import java.util.List; -import static com.google.common.truth.Truth.assertThat; - @RunWith(AndroidJUnit4.class) @SmallTest public class BackupIntentTest { diff --git a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java index da25ac04999..e93135df5c5 100644 --- a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java +++ b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java @@ -22,7 +22,6 @@ import static android.support.test.espresso.intent.Intents.intended; import static android.support.test.espresso.intent.Intents.intending; import static android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent; import static android.support.test.espresso.matcher.ViewMatchers.withId; - import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/tests/unit/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java b/tests/unit/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java index 220211ac19e..8cbf29b48ee 100644 --- a/tests/unit/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java +++ b/tests/unit/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java @@ -21,8 +21,6 @@ import android.test.suitebuilder.annotation.SmallTest; import android.text.InputFilter; import android.text.SpannableStringBuilder; -import com.android.settings.bluetooth.Utf8ByteLengthFilter; - public class Utf8ByteLengthFilterTest extends AndroidTestCase { @SmallTest diff --git a/tests/unit/src/com/android/settings/core/UserRestrictionTest.java b/tests/unit/src/com/android/settings/core/UserRestrictionTest.java index dc4a120d77b..4fa7b08d13f 100644 --- a/tests/unit/src/com/android/settings/core/UserRestrictionTest.java +++ b/tests/unit/src/com/android/settings/core/UserRestrictionTest.java @@ -23,7 +23,6 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.content.res.XmlResourceParser; import android.os.UserManager; -import android.platform.test.annotations.Presubmit; import android.provider.SearchIndexableResource; import android.support.test.InstrumentationRegistry; import android.support.test.filters.MediumTest; diff --git a/tests/unit/src/com/android/settings/dashboard/DashboardSummaryInstrumentationTest.java b/tests/unit/src/com/android/settings/dashboard/DashboardSummaryInstrumentationTest.java index 021013a732d..4345b9918fe 100644 --- a/tests/unit/src/com/android/settings/dashboard/DashboardSummaryInstrumentationTest.java +++ b/tests/unit/src/com/android/settings/dashboard/DashboardSummaryInstrumentationTest.java @@ -19,7 +19,6 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; import android.app.Activity; -import android.app.Fragment; import android.app.Instrumentation; import android.content.Context; import android.content.Intent; @@ -39,6 +38,8 @@ import org.junit.runner.RunWith; import java.util.List; +import androidx.fragment.app.Fragment; + @RunWith(AndroidJUnit4.class) @SmallTest public class DashboardSummaryInstrumentationTest { diff --git a/tests/unit/src/com/android/settings/dashboard/PreferenceThemeTest.java b/tests/unit/src/com/android/settings/dashboard/PreferenceThemeTest.java index 16e309d1eb6..7cf76c63b6f 100644 --- a/tests/unit/src/com/android/settings/dashboard/PreferenceThemeTest.java +++ b/tests/unit/src/com/android/settings/dashboard/PreferenceThemeTest.java @@ -16,6 +16,15 @@ package com.android.settings.dashboard; +import static android.support.test.espresso.Espresso.onView; +import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist; +import static android.support.test.espresso.assertion.ViewAssertions.matches; +import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; +import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; +import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static com.android.settings.dashboard.FirstIdViewMatcher.withFirstId; +import static org.hamcrest.Matchers.allOf; + import android.app.Instrumentation; import android.content.Context; import android.content.Intent; @@ -30,16 +39,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static com.android.settings.dashboard.FirstIdViewMatcher.withFirstId; - -import static org.hamcrest.Matchers.allOf; - @RunWith(AndroidJUnit4.class) @SmallTest public class PreferenceThemeTest { diff --git a/tests/unit/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java b/tests/unit/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java index 0b5ade8fc11..444be935554 100644 --- a/tests/unit/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java +++ b/tests/unit/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java @@ -17,7 +17,6 @@ package com.android.settings.datetime.timezone.model; import static com.google.common.truth.Truth.assertThat; -import android.support.test.InstrumentationRegistry; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; diff --git a/tests/unit/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java b/tests/unit/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java index be36e43dbb2..5c8f8b5189b 100644 --- a/tests/unit/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java +++ b/tests/unit/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java @@ -17,9 +17,8 @@ package com.android.settings.deviceinfo; -import android.content.Intent; import android.content.Context; - +import android.content.Intent; import android.os.storage.VolumeRecord; import android.support.test.InstrumentationRegistry; import android.support.test.filters.SmallTest; diff --git a/tests/unit/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java b/tests/unit/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java index 00b710f8029..e0fb1af1fa8 100644 --- a/tests/unit/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java +++ b/tests/unit/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java @@ -1,15 +1,5 @@ package com.android.settings.deviceinfo; -import android.support.test.espresso.intent.rule.IntentsTestRule; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnitRunner; -import com.android.settings.R; -import com.android.settings.Settings.StorageDashboardActivity; -import com.android.settings.deletionhelper.AutomaticStorageManagerSettings; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; - import static android.support.test.espresso.Espresso.onView; import static android.support.test.espresso.action.ViewActions.click; import static android.support.test.espresso.intent.Intents.intended; @@ -18,6 +8,16 @@ import static android.support.test.espresso.matcher.ViewMatchers.withText; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; +import android.support.test.espresso.intent.rule.IntentsTestRule; +import android.support.test.filters.SmallTest; + +import com.android.settings.R; +import com.android.settings.Settings.StorageDashboardActivity; +import com.android.settings.deletionhelper.AutomaticStorageManagerSettings; + +import org.junit.Rule; +import org.junit.Test; + @SmallTest public class StorageDashboardFragmentTest { diff --git a/tests/unit/src/com/android/settings/dream/DreamSettingsLaunchTest.java b/tests/unit/src/com/android/settings/dream/DreamSettingsLaunchTest.java index 497fa0a6d7a..0993564143c 100644 --- a/tests/unit/src/com/android/settings/dream/DreamSettingsLaunchTest.java +++ b/tests/unit/src/com/android/settings/dream/DreamSettingsLaunchTest.java @@ -22,6 +22,7 @@ import android.provider.Settings; import android.support.test.InstrumentationRegistry; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/unit/src/com/android/settings/fuelgauge/batterytip/RestrictAppTest.java b/tests/unit/src/com/android/settings/fuelgauge/batterytip/RestrictAppTest.java index a24a17ae070..788b3ba949b 100644 --- a/tests/unit/src/com/android/settings/fuelgauge/batterytip/RestrictAppTest.java +++ b/tests/unit/src/com/android/settings/fuelgauge/batterytip/RestrictAppTest.java @@ -20,7 +20,6 @@ import static android.support.test.espresso.Espresso.onView; import static android.support.test.espresso.assertion.ViewAssertions.matches; import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; import static android.support.test.espresso.matcher.ViewMatchers.withText; - import static com.google.common.truth.Truth.assertThat; import android.app.Instrumentation; diff --git a/tests/unit/src/com/android/settings/notification/AppNotificationSettingsTest.java b/tests/unit/src/com/android/settings/notification/AppNotificationSettingsTest.java index 16a0b4324ad..4d5278a49cb 100644 --- a/tests/unit/src/com/android/settings/notification/AppNotificationSettingsTest.java +++ b/tests/unit/src/com/android/settings/notification/AppNotificationSettingsTest.java @@ -21,17 +21,13 @@ import static android.support.test.espresso.Espresso.onView; import static android.support.test.espresso.action.ViewActions.click; import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist; import static android.support.test.espresso.assertion.ViewAssertions.matches; -import android.support.test.espresso.intent.Intents; - import static android.support.test.espresso.intent.Intents.intended; import static android.support.test.espresso.intent.matcher.IntentMatchers.hasExtra; import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; import static android.support.test.espresso.matcher.ViewMatchers.withId; import static android.support.test.espresso.matcher.ViewMatchers.withText; - import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT; - import static org.hamcrest.Matchers.allOf; import static org.junit.Assert.fail; @@ -43,6 +39,7 @@ import android.content.Context; import android.content.Intent; import android.provider.Settings; import android.support.test.InstrumentationRegistry; +import android.support.test.espresso.intent.Intents; import android.support.test.espresso.matcher.ViewMatchers; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; diff --git a/tests/unit/src/com/android/settings/notification/ChannelNotificationSettingsTest.java b/tests/unit/src/com/android/settings/notification/ChannelNotificationSettingsTest.java index 1244dcda4f5..f27bfd4ce10 100644 --- a/tests/unit/src/com/android/settings/notification/ChannelNotificationSettingsTest.java +++ b/tests/unit/src/com/android/settings/notification/ChannelNotificationSettingsTest.java @@ -21,9 +21,7 @@ import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.support.test.espresso.Espresso.onView; import static android.support.test.espresso.assertion.ViewAssertions.matches; import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.withId; import static android.support.test.espresso.matcher.ViewMatchers.withText; - import static org.hamcrest.Matchers.allOf; import static org.junit.Assert.fail; diff --git a/tests/unit/src/com/android/settings/notification/ZenModeSettingsIntegrationTest.java b/tests/unit/src/com/android/settings/notification/ZenModeSettingsIntegrationTest.java index d5e7aaeb3eb..e7a057c358f 100644 --- a/tests/unit/src/com/android/settings/notification/ZenModeSettingsIntegrationTest.java +++ b/tests/unit/src/com/android/settings/notification/ZenModeSettingsIntegrationTest.java @@ -1,7 +1,6 @@ package com.android.settings; import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; import static android.support.test.espresso.assertion.ViewAssertions.matches; import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; import static android.support.test.espresso.matcher.ViewMatchers.withText; @@ -15,7 +14,6 @@ import android.support.test.runner.AndroidJUnit4; import android.support.test.uiautomator.UiDevice; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/unit/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/unit/src/com/android/settings/password/ChooseLockPasswordTest.java index 36611cf50bf..87a8af8399e 100644 --- a/tests/unit/src/com/android/settings/password/ChooseLockPasswordTest.java +++ b/tests/unit/src/com/android/settings/password/ChooseLockPasswordTest.java @@ -23,13 +23,11 @@ import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; import static android.support.test.espresso.matcher.ViewMatchers.isEnabled; import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; import static android.support.test.espresso.matcher.ViewMatchers.withId; - import static org.hamcrest.CoreMatchers.not; import android.app.Instrumentation; import android.content.Context; import android.content.Intent; -import android.os.SystemClock; import android.support.test.InstrumentationRegistry; import android.support.test.espresso.action.ViewActions; import android.support.test.espresso.matcher.ViewMatchers; diff --git a/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java b/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java index 3a6c39c5c68..f533056b76d 100644 --- a/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java +++ b/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java @@ -25,9 +25,6 @@ import static android.support.test.espresso.matcher.ViewMatchers.isEnabled; import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; import static android.support.test.espresso.matcher.ViewMatchers.withId; import static android.support.test.espresso.matcher.ViewMatchers.withText; - -import static com.google.common.truth.Truth.assertThat; - import static org.hamcrest.CoreMatchers.not; import android.support.test.espresso.action.ViewActions; diff --git a/tests/unit/src/com/android/settings/print/PrintJobSettingsActivityTest.java b/tests/unit/src/com/android/settings/print/PrintJobSettingsActivityTest.java index 8fcd0828bb2..f5381d4a2b6 100644 --- a/tests/unit/src/com/android/settings/print/PrintJobSettingsActivityTest.java +++ b/tests/unit/src/com/android/settings/print/PrintJobSettingsActivityTest.java @@ -32,7 +32,6 @@ import android.print.PrintDocumentAdapter; import android.print.PrintDocumentInfo; import android.print.PrintJob; import android.print.PrintManager; -import androidx.annotation.NonNull; import android.support.test.InstrumentationRegistry; import android.support.test.filters.LargeTest; import android.support.test.rule.ActivityTestRule; @@ -54,6 +53,8 @@ import java.io.FileInputStream; import java.io.IOException; import java.util.UUID; +import androidx.annotation.NonNull; + @RunWith(AndroidJUnit4.class) public class PrintJobSettingsActivityTest { private static final String EXTRA_PRINT_JOB_ID = "EXTRA_PRINT_JOB_ID"; diff --git a/tests/unit/src/com/android/settings/tests/BluetoothRequestPermissionTest.java b/tests/unit/src/com/android/settings/tests/BluetoothRequestPermissionTest.java index 442f4b6aa65..0afbcea7506 100644 --- a/tests/unit/src/com/android/settings/tests/BluetoothRequestPermissionTest.java +++ b/tests/unit/src/com/android/settings/tests/BluetoothRequestPermissionTest.java @@ -30,6 +30,7 @@ import android.view.View.OnClickListener; import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.ListView; + import com.android.settings.tests.unit.R; public class BluetoothRequestPermissionTest extends Activity { diff --git a/tests/unit/src/com/android/settings/tests/DrawOverlayDetailsTest.java b/tests/unit/src/com/android/settings/tests/DrawOverlayDetailsTest.java index 3e00a45f11f..9bf9ac48818 100644 --- a/tests/unit/src/com/android/settings/tests/DrawOverlayDetailsTest.java +++ b/tests/unit/src/com/android/settings/tests/DrawOverlayDetailsTest.java @@ -16,28 +16,29 @@ package com.android.settings.tests; -import android.app.Instrumentation; -import android.content.Context; -import android.content.Intent; -import android.content.pm.PackageManager; -import android.support.test.InstrumentationRegistry; -import android.support.test.uiautomator.UiDevice; - -import org.junit.runner.RunWith; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; -import android.support.test.uiautomator.UiScrollable; -import android.support.test.uiautomator.UiSelector; -import org.junit.Test; -import com.android.settings.R; - import static android.support.test.espresso.Espresso.onView; +import static android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu; import static android.support.test.espresso.action.ViewActions.click; import static android.support.test.espresso.assertion.ViewAssertions.matches; import static android.support.test.espresso.matcher.ViewMatchers.isEnabled; import static android.support.test.espresso.matcher.ViewMatchers.withText; import static org.hamcrest.core.IsNot.not; -import static android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu; + +import android.app.Instrumentation; +import android.content.Context; +import android.content.Intent; +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.test.uiautomator.UiDevice; +import android.support.test.uiautomator.UiScrollable; +import android.support.test.uiautomator.UiSelector; + +import com.android.settings.R; + +import org.junit.Test; +import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) @SmallTest diff --git a/tests/unit/src/com/android/settings/tests/KeepOnScreenTest.java b/tests/unit/src/com/android/settings/tests/KeepOnScreenTest.java index 0b1308e6d03..64eee42340a 100644 --- a/tests/unit/src/com/android/settings/tests/KeepOnScreenTest.java +++ b/tests/unit/src/com/android/settings/tests/KeepOnScreenTest.java @@ -16,24 +16,24 @@ package com.android.settings.tests; +import static android.support.test.espresso.Espresso.onView; +import static android.support.test.espresso.action.ViewActions.click; +import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static junit.framework.Assert.assertEquals; + import android.app.Instrumentation; import android.content.Context; import android.content.Intent; import android.os.BatteryManager; import android.provider.Settings; import android.support.test.InstrumentationRegistry; -import org.junit.After; -import org.junit.Before; -import org.junit.runner.RunWith; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; -import org.junit.Test; + import com.android.settings.R; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.matcher.ViewMatchers.*; -import static junit.framework.Assert.assertEquals; +import org.junit.Test; +import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) @SmallTest diff --git a/tests/unit/src/com/android/settings/tests/Manufacturer.java b/tests/unit/src/com/android/settings/tests/Manufacturer.java index a708d1b3d97..6efe30c5a34 100644 --- a/tests/unit/src/com/android/settings/tests/Manufacturer.java +++ b/tests/unit/src/com/android/settings/tests/Manufacturer.java @@ -18,6 +18,7 @@ package com.android.settings.tests; import android.app.Activity; import android.os.Bundle; + import com.android.settings.tests.unit.R; public class Manufacturer extends Activity { diff --git a/tests/unit/src/com/android/settings/tests/Operator.java b/tests/unit/src/com/android/settings/tests/Operator.java index 94bcc78441b..6d61405f045 100644 --- a/tests/unit/src/com/android/settings/tests/Operator.java +++ b/tests/unit/src/com/android/settings/tests/Operator.java @@ -18,6 +18,7 @@ package com.android.settings.tests; import android.app.Activity; import android.os.Bundle; + import com.android.settings.tests.unit.R; public class Operator extends Activity { diff --git a/tests/unit/src/com/android/settings/tests/PrivateVolumeSettingsTest.java b/tests/unit/src/com/android/settings/tests/PrivateVolumeSettingsTest.java index ead20cb0f6b..d10b20b8a03 100644 --- a/tests/unit/src/com/android/settings/tests/PrivateVolumeSettingsTest.java +++ b/tests/unit/src/com/android/settings/tests/PrivateVolumeSettingsTest.java @@ -15,19 +15,19 @@ */ package com.android.settings.tests; +import static android.support.test.espresso.Espresso.onView; +import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist; +import static android.support.test.espresso.matcher.ViewMatchers.withText; + import android.app.Instrumentation; import android.content.Intent; import android.support.test.InstrumentationRegistry; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.withText; - @RunWith(AndroidJUnit4.class) @SmallTest public class PrivateVolumeSettingsTest { diff --git a/tests/unit/src/com/android/settings/tests/SettingsRestoreAfterCloseTest.java b/tests/unit/src/com/android/settings/tests/SettingsRestoreAfterCloseTest.java index 96bc78c9f00..cd9ac9790dc 100644 --- a/tests/unit/src/com/android/settings/tests/SettingsRestoreAfterCloseTest.java +++ b/tests/unit/src/com/android/settings/tests/SettingsRestoreAfterCloseTest.java @@ -25,6 +25,7 @@ import android.support.test.runner.AndroidJUnit4; import android.support.test.uiautomator.By; import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.Until; + import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/unit/src/com/android/settings/users/UserSettingsTest.java b/tests/unit/src/com/android/settings/users/UserSettingsTest.java index 2ecf161a7bd..6d0021aee27 100644 --- a/tests/unit/src/com/android/settings/users/UserSettingsTest.java +++ b/tests/unit/src/com/android/settings/users/UserSettingsTest.java @@ -24,9 +24,9 @@ import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.UiObject; -import android.support.test.uiautomator.UiSelector; -import android.support.test.uiautomator.UiScrollable; import android.support.test.uiautomator.UiObjectNotFoundException; +import android.support.test.uiautomator.UiScrollable; +import android.support.test.uiautomator.UiSelector; import org.junit.Before; import org.junit.Test; diff --git a/tests/unit/src/com/android/settings/utils/FileSizeFormatterTest.java b/tests/unit/src/com/android/settings/utils/FileSizeFormatterTest.java index c5b050a5a7e..d2be760df88 100644 --- a/tests/unit/src/com/android/settings/utils/FileSizeFormatterTest.java +++ b/tests/unit/src/com/android/settings/utils/FileSizeFormatterTest.java @@ -18,7 +18,6 @@ package com.android.settings.utils; import static com.android.settings.utils.FileSizeFormatter.GIGABYTE_IN_BYTES; import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES; - import static com.google.common.truth.Truth.assertThat; import android.content.Context; diff --git a/tests/unit/src/com/android/settings/utils/MockedServiceManager.java b/tests/unit/src/com/android/settings/utils/MockedServiceManager.java index ea04974ddc3..a4891016654 100644 --- a/tests/unit/src/com/android/settings/utils/MockedServiceManager.java +++ b/tests/unit/src/com/android/settings/utils/MockedServiceManager.java @@ -18,7 +18,6 @@ package com.android.settings.testutils; import android.os.IBinder; import android.os.ServiceManager; -import android.util.Log; import java.lang.reflect.Field; import java.util.HashMap; diff --git a/tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java b/tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java index fe074cc3e1e..1a9701d68ab 100644 --- a/tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java +++ b/tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java @@ -17,7 +17,6 @@ package com.android.settings.vpn2; import static com.android.settings.vpn2.AppManagementFragment.appHasVpnPermission; - import static org.mockito.Mockito.any; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.when; diff --git a/tests/unit/src/com/android/settings/vpn2/PreferenceListTest.java b/tests/unit/src/com/android/settings/vpn2/PreferenceListTest.java index 2accbf2aa0c..31856f511a8 100644 --- a/tests/unit/src/com/android/settings/vpn2/PreferenceListTest.java +++ b/tests/unit/src/com/android/settings/vpn2/PreferenceListTest.java @@ -17,29 +17,34 @@ package com.android.settings.vpn2; import static org.mockito.AdditionalMatchers.not; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.argThat; +import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; -import android.content.Context; -import android.content.Context; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; import android.text.TextUtils; import com.android.internal.net.LegacyVpnInfo; import com.android.internal.net.VpnProfile; -import com.android.settings.R; -import com.android.settings.vpn2.VpnSettings; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + public class PreferenceListTest extends AndroidTestCase { private static final String TAG = "PreferenceListTest"; diff --git a/tests/unit/src/com/android/settings/wifi/WifiCallingSettingUiTest.java b/tests/unit/src/com/android/settings/wifi/WifiCallingSettingUiTest.java index 16617d046bf..1a7252fcfbc 100644 --- a/tests/unit/src/com/android/settings/wifi/WifiCallingSettingUiTest.java +++ b/tests/unit/src/com/android/settings/wifi/WifiCallingSettingUiTest.java @@ -23,7 +23,6 @@ import static android.support.test.espresso.matcher.ViewMatchers.isCompletelyDis import static android.support.test.espresso.matcher.ViewMatchers.isSelected; import static android.support.test.espresso.matcher.ViewMatchers.withResourceName; import static android.support.test.espresso.matcher.ViewMatchers.withText; - import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.anything; import static org.junit.Assert.assertEquals; diff --git a/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java b/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java index bc6caf654ef..4c8bb998c09 100644 --- a/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java +++ b/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java @@ -24,19 +24,14 @@ import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; import static android.support.test.espresso.matcher.ViewMatchers.withId; import static android.support.test.espresso.matcher.ViewMatchers.withText; - import static com.google.common.truth.Truth.assertThat; - import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.startsWith; -import static org.mockito.Mockito.atMost; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.Activity; -import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.net.ConnectivityManager; @@ -70,6 +65,8 @@ import org.mockito.MockitoAnnotations; import java.util.List; +import androidx.fragment.app.Fragment; + @RunWith(AndroidJUnit4.class) public class WifiSettingsUiTest { private static final String TEST_SSID = "\"Test Ssid\""; diff --git a/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java b/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java index 7bf57983e02..09b317ca932 100644 --- a/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java +++ b/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java @@ -16,10 +16,6 @@ package com.android.settings.wifi.tether; -import static org.junit.Assert.*; -import static org.mockito.Matchers.*; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import static android.net.ConnectivityManager.EXTRA_ADD_TETHER_TYPE; import static android.net.ConnectivityManager.EXTRA_PROVISION_CALLBACK; import static android.net.ConnectivityManager.EXTRA_REM_TETHER_TYPE; @@ -31,6 +27,11 @@ import static android.net.ConnectivityManager.TETHERING_USB; import static android.net.ConnectivityManager.TETHERING_WIFI; import static android.net.ConnectivityManager.TETHER_ERROR_NO_ERROR; import static android.net.ConnectivityManager.TETHER_ERROR_PROVISION_FAILED; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyLong; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import android.app.Activity; import android.app.AlarmManager; @@ -41,12 +42,12 @@ import android.content.Context; import android.content.ContextWrapper; import android.content.Intent; import android.content.IntentFilter; -import android.content.pm.ActivityInfo; -import android.content.pm.ApplicationInfo; -import android.content.pm.ResolveInfo; -import android.content.pm.PackageManager; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; +import android.content.pm.ActivityInfo; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.net.ConnectivityManager; import android.net.wifi.WifiManager; diff --git a/tests/unit/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/tests/unit/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java index b311816c82f..96e6c4ee0b1 100644 --- a/tests/unit/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java +++ b/tests/unit/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java @@ -16,6 +16,11 @@ package com.android.settings.wifi.tether; +import static android.support.test.espresso.Espresso.onView; +import static android.support.test.espresso.assertion.ViewAssertions.matches; +import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; +import static android.support.test.espresso.matcher.ViewMatchers.withText; + import android.app.Instrumentation; import android.content.Intent; import android.support.test.InstrumentationRegistry; @@ -33,11 +38,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.withText; - @RunWith(AndroidJUnit4.class) @SmallTest public class WifiTetherSettingsTest {