diff --git a/src/com/android/settings/datausage/AppDataUsageActivity.java b/src/com/android/settings/datausage/AppDataUsageActivity.java index 82a3a4526aa..48bedceba28 100644 --- a/src/com/android/settings/datausage/AppDataUsageActivity.java +++ b/src/com/android/settings/datausage/AppDataUsageActivity.java @@ -17,7 +17,6 @@ package com.android.settings.datausage; import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; -import android.provider.Settings; import android.util.Log; import com.android.settings.R; diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java index d8656caa3b3..09b0fa1fd57 100644 --- a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java +++ b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java @@ -42,7 +42,6 @@ import java.util.ArrayList; import java.util.Set; import java.util.TreeSet; - public class UnrestrictedDataAccessPreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart, OnStop, OnDestroy, ApplicationsState.Callbacks, AppStateBaseBridge.Callback, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/deviceinfo/MigrateEstimateTask.java b/src/com/android/settings/deviceinfo/MigrateEstimateTask.java index a5790b32d70..9198ade659f 100644 --- a/src/com/android/settings/deviceinfo/MigrateEstimateTask.java +++ b/src/com/android/settings/deviceinfo/MigrateEstimateTask.java @@ -29,9 +29,9 @@ import android.os.UserHandle; import android.os.UserManager; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; -import android.util.Log; import android.text.format.DateUtils; import android.text.format.Formatter; +import android.util.Log; import java.io.IOException; import java.util.UUID; diff --git a/src/com/android/settings/deviceinfo/PercentageBarChart.java b/src/com/android/settings/deviceinfo/PercentageBarChart.java index cb25b81c621..9add2b75ed7 100644 --- a/src/com/android/settings/deviceinfo/PercentageBarChart.java +++ b/src/com/android/settings/deviceinfo/PercentageBarChart.java @@ -143,7 +143,7 @@ public class PercentageBarChart extends View { /** * Adds a new slice to the percentage bar chart. Callers are responsible for * later calling {@link #invalidate()}. - * + * * @param percentage the total width that * @param color the color to draw the entry */ diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java index 6294ab90a14..bd7ca822a98 100644 --- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java +++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java @@ -19,7 +19,6 @@ package com.android.settings.deviceinfo; import android.app.usage.StorageStatsManager; import android.content.Context; import android.content.res.ColorStateList; -import android.graphics.Color; import android.graphics.drawable.Drawable; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java index 2ade3c29352..e2d3d8a9bca 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java @@ -17,18 +17,12 @@ package com.android.settings.deviceinfo.firmwareversion; import android.app.settings.SettingsEnums; -import android.content.Context; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settingslib.search.Indexable; import com.android.settingslib.search.SearchIndexable; -import java.util.ArrayList; -import java.util.List; - @SearchIndexable public class FirmwareVersionSettings extends DashboardFragment { diff --git a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java index adcbb2a5634..713eaf4f41a 100644 --- a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java +++ b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java @@ -18,18 +18,12 @@ package com.android.settings.deviceinfo.hardwareinfo; import android.app.settings.SettingsEnums; import android.content.Context; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settingslib.search.Indexable; import com.android.settingslib.search.SearchIndexable; -import java.util.ArrayList; -import java.util.List; - - @SearchIndexable public class HardwareInfoFragment extends DashboardFragment { diff --git a/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java b/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java index 0e164747b6f..9465fff3b66 100644 --- a/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java +++ b/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java @@ -27,7 +27,6 @@ import com.android.settings.core.BasePreferenceController; import java.util.List; - public abstract class LegalPreferenceController extends BasePreferenceController { private final PackageManager mPackageManager; private Preference mPreference; diff --git a/src/com/android/settings/network/AllowedNetworkTypesListener.java b/src/com/android/settings/network/AllowedNetworkTypesListener.java index a9ed8be7327..c5a4f0b4fd6 100644 --- a/src/com/android/settings/network/AllowedNetworkTypesListener.java +++ b/src/com/android/settings/network/AllowedNetworkTypesListener.java @@ -17,7 +17,6 @@ package com.android.settings.network; import android.content.Context; -import android.telephony.PhoneStateListener; import android.telephony.TelephonyCallback; import android.telephony.TelephonyManager; import android.util.Log; @@ -27,7 +26,6 @@ import androidx.annotation.VisibleForTesting; import java.util.Map; import java.util.concurrent.Executor; - /** * {@link TelephonyCallback} to listen to Allowed Network Types changed */ @@ -50,7 +48,7 @@ public class AllowedNetworkTypesListener extends TelephonyCallback implements } /** - * Register a PhoneStateListener for Allowed Network Types changed. + * Register a TelephonyCallback for Allowed Network Types changed. * @param context the Context * @param subId the subscription id. */ @@ -61,7 +59,7 @@ public class AllowedNetworkTypesListener extends TelephonyCallback implements } /** - * Unregister a PhoneStateListener for Allowed Network Types changed. + * Unregister a TelephonyCallback for Allowed Network Types changed. * @param context the Context * @param subId the subscription id. */ diff --git a/src/com/android/settings/network/MobileNetworkListController.java b/src/com/android/settings/network/MobileNetworkListController.java index f1980b26ac9..bde2e5449a3 100644 --- a/src/com/android/settings/network/MobileNetworkListController.java +++ b/src/com/android/settings/network/MobileNetworkListController.java @@ -26,6 +26,12 @@ import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.util.ArrayMap; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.LifecycleObserver; +import androidx.lifecycle.OnLifecycleEvent; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.network.telephony.MobileNetworkActivity; @@ -35,12 +41,6 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.List; import java.util.Map; -import androidx.lifecycle.Lifecycle; -import androidx.lifecycle.LifecycleObserver; -import androidx.lifecycle.OnLifecycleEvent; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - /** * This populates the entries on a page which lists all available mobile subscriptions. Each entry * has the name of the subscription with some subtext giving additional detail, and clicking on the diff --git a/src/com/android/settings/network/MobilePlanPreferenceController.java b/src/com/android/settings/network/MobilePlanPreferenceController.java index b4135b8b6f8..d8963ad9374 100644 --- a/src/com/android/settings/network/MobilePlanPreferenceController.java +++ b/src/com/android/settings/network/MobilePlanPreferenceController.java @@ -47,7 +47,6 @@ import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState; import java.util.List; - public class MobilePlanPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnCreate, OnSaveInstanceState { diff --git a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java index 7239b00d084..4b452c01c15 100644 --- a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java +++ b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java @@ -23,7 +23,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settingslib.core.AbstractPreferenceController; import java.util.List; diff --git a/src/com/android/settings/network/VpnPreferenceController.java b/src/com/android/settings/network/VpnPreferenceController.java index 9295414ac0a..e815d494a39 100644 --- a/src/com/android/settings/network/VpnPreferenceController.java +++ b/src/com/android/settings/network/VpnPreferenceController.java @@ -47,7 +47,6 @@ import com.android.settingslib.utils.ThreadUtils; import java.util.List; - public class VpnPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/network/ims/ImsQueryEnhanced4gLteModeUserSetting.java b/src/com/android/settings/network/ims/ImsQueryEnhanced4gLteModeUserSetting.java index 34d8430f57a..c6c5ad3e924 100644 --- a/src/com/android/settings/network/ims/ImsQueryEnhanced4gLteModeUserSetting.java +++ b/src/com/android/settings/network/ims/ImsQueryEnhanced4gLteModeUserSetting.java @@ -19,7 +19,6 @@ package com.android.settings.network.ims; import android.telephony.ims.ImsMmTelManager; import android.util.Log; - /** * An {@link ImsQuery} for accessing IMS user setting for enhanced 4G LTE */ diff --git a/src/com/android/settings/network/ims/ImsQueryProvisioningStat.java b/src/com/android/settings/network/ims/ImsQueryProvisioningStat.java index b52d22c71bf..44c45190c54 100644 --- a/src/com/android/settings/network/ims/ImsQueryProvisioningStat.java +++ b/src/com/android/settings/network/ims/ImsQueryProvisioningStat.java @@ -21,7 +21,6 @@ import android.telephony.ims.feature.MmTelFeature; import android.telephony.ims.stub.ImsRegistrationImplBase; import android.util.Log; - /** * An {@link ImsQuery} for accessing IMS provision stat */ diff --git a/src/com/android/settings/network/ims/ImsQueryTtyOnVolteStat.java b/src/com/android/settings/network/ims/ImsQueryTtyOnVolteStat.java index e2719dd27aa..8a306c57976 100644 --- a/src/com/android/settings/network/ims/ImsQueryTtyOnVolteStat.java +++ b/src/com/android/settings/network/ims/ImsQueryTtyOnVolteStat.java @@ -19,7 +19,6 @@ package com.android.settings.network.ims; import android.telephony.ims.ImsMmTelManager; import android.util.Log; - /** * An {@link ImsQuery} for accessing IMS tty on VoLte stat */ diff --git a/src/com/android/settings/network/ims/ImsQueryVtUserSetting.java b/src/com/android/settings/network/ims/ImsQueryVtUserSetting.java index 6da4a4c07c6..91cecb16db0 100644 --- a/src/com/android/settings/network/ims/ImsQueryVtUserSetting.java +++ b/src/com/android/settings/network/ims/ImsQueryVtUserSetting.java @@ -19,7 +19,6 @@ package com.android.settings.network.ims; import android.telephony.ims.ImsMmTelManager; import android.util.Log; - /** * An {@link ImsQuery} for accessing IMS VT enabled settings from user */ diff --git a/src/com/android/settings/network/ims/ImsQueryWfcUserSetting.java b/src/com/android/settings/network/ims/ImsQueryWfcUserSetting.java index 3407413d3e8..5e4d471e222 100644 --- a/src/com/android/settings/network/ims/ImsQueryWfcUserSetting.java +++ b/src/com/android/settings/network/ims/ImsQueryWfcUserSetting.java @@ -19,7 +19,6 @@ package com.android.settings.network.ims; import android.telephony.ims.ImsMmTelManager; import android.util.Log; - /** * An {@link ImsQuery} for accessing IMS WFC enabled settings from user */ diff --git a/src/com/android/settings/network/telephony/ContactDiscoveryDialogFragment.java b/src/com/android/settings/network/telephony/ContactDiscoveryDialogFragment.java index 26398d7e03c..e43865b6d4b 100644 --- a/src/com/android/settings/network/telephony/ContactDiscoveryDialogFragment.java +++ b/src/com/android/settings/network/telephony/ContactDiscoveryDialogFragment.java @@ -22,11 +22,9 @@ import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; import android.telephony.ims.ImsManager; -import android.telephony.ims.ImsRcsManager; import android.text.TextUtils; import androidx.annotation.VisibleForTesting; -import androidx.fragment.app.FragmentManager; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java b/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java index eead41fe5cc..6aef43de91e 100644 --- a/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java +++ b/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java @@ -37,7 +37,6 @@ import androidx.preference.SwitchPreference; import com.android.settings.network.SubscriptionUtil; - /** * Controller for the "Contact Discovery" option present in MobileNetworkSettings. */ diff --git a/src/com/android/settings/network/telephony/MobileDataDialogFragment.java b/src/com/android/settings/network/telephony/MobileDataDialogFragment.java index c8a1e985333..b5894f65731 100644 --- a/src/com/android/settings/network/telephony/MobileDataDialogFragment.java +++ b/src/com/android/settings/network/telephony/MobileDataDialogFragment.java @@ -29,7 +29,6 @@ import androidx.appcompat.app.AlertDialog; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; - /** * Dialog Fragment to show dialog for "mobile data" * diff --git a/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java b/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java index 78dfe51f007..fd5df6fbedc 100644 --- a/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java +++ b/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java @@ -28,7 +28,6 @@ import com.android.settings.core.BasePreferenceController; import com.android.settings.utils.AnnotationSpan; import com.android.settingslib.HelpUtils; - /** * Class to show the footer that can't connect to 5G when device is in DSDS mode. */ diff --git a/src/com/android/settings/network/telephony/TelephonyAvailabilityHandler.java b/src/com/android/settings/network/telephony/TelephonyAvailabilityHandler.java index c1acd91667e..557f2c4362e 100644 --- a/src/com/android/settings/network/telephony/TelephonyAvailabilityHandler.java +++ b/src/com/android/settings/network/telephony/TelephonyAvailabilityHandler.java @@ -20,8 +20,6 @@ */ package com.android.settings.network.telephony; -import android.content.Context; - public interface TelephonyAvailabilityHandler { /** diff --git a/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java b/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java index cdeb1e58fb9..4047009b325 100644 --- a/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java +++ b/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java @@ -41,7 +41,6 @@ import com.android.settings.network.telephony.MobileNetworkUtils; import com.android.settings.network.telephony.NetworkSelectSettings; import com.android.settings.network.telephony.TelephonyBasePreferenceController; - /** * Preference controller for "Open network select" */ diff --git a/src/com/android/settings/sim/CallsSimListDialogFragment.java b/src/com/android/settings/sim/CallsSimListDialogFragment.java index 6dd262b256c..58da1117f15 100644 --- a/src/com/android/settings/sim/CallsSimListDialogFragment.java +++ b/src/com/android/settings/sim/CallsSimListDialogFragment.java @@ -18,7 +18,6 @@ package com.android.settings.sim; import android.app.settings.SettingsEnums; import android.content.Context; -import android.telecom.PhoneAccount; import android.telecom.PhoneAccountHandle; import android.telecom.TelecomManager; import android.telephony.SubscriptionInfo; diff --git a/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java b/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java index 727c61e90ba..876f5e99e77 100644 --- a/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java +++ b/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java @@ -27,6 +27,7 @@ import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.ApplicationsState.AppFilter; import java.util.List; + /* * Connects info of apps that change wifi state to the ApplicationsState. Wraps around the generic * AppStateAppOpsBridge class to tailor to the semantics of CHANGE_WIFI_STATE. Also provides app diff --git a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java index f179df0470e..9e499b69251 100644 --- a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java +++ b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java @@ -22,7 +22,6 @@ import android.content.DialogInterface; import android.graphics.drawable.Drawable; import android.net.wifi.ScanResult; import android.net.wifi.WifiConfiguration; -import android.net.wifi.WifiManager.NetworkRequestMatchCallback; import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback; import android.os.Bundle; import android.text.TextUtils; diff --git a/src/com/android/settings/wifi/WifiAPITest.java b/src/com/android/settings/wifi/WifiAPITest.java index 87499f58913..15465edb04b 100644 --- a/src/com/android/settings/wifi/WifiAPITest.java +++ b/src/com/android/settings/wifi/WifiAPITest.java @@ -32,7 +32,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; - /** * Provide an interface for testing out the Wifi API */ diff --git a/src/com/android/settings/wifi/WifiConfigInfo.java b/src/com/android/settings/wifi/WifiConfigInfo.java index f042feb07a7..0de306396a2 100644 --- a/src/com/android/settings/wifi/WifiConfigInfo.java +++ b/src/com/android/settings/wifi/WifiConfigInfo.java @@ -26,7 +26,6 @@ import com.android.settings.R; import java.util.List; - /** * Configuration details saved by the user on the WifiSettings screen */ diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java index 77827867630..c2f81892311 100644 --- a/src/com/android/settings/wifi/WifiDialogActivity.java +++ b/src/com/android/settings/wifi/WifiDialogActivity.java @@ -22,7 +22,6 @@ import android.content.Intent; import android.net.NetworkInfo; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; -import android.net.wifi.WifiManager.ActionListener; import android.os.Bundle; import android.util.Log; diff --git a/src/com/android/settings/wifi/WifiInfo.java b/src/com/android/settings/wifi/WifiInfo.java index a131f186370..0d6d63d715d 100644 --- a/src/com/android/settings/wifi/WifiInfo.java +++ b/src/com/android/settings/wifi/WifiInfo.java @@ -22,7 +22,6 @@ import android.os.Bundle; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; - /** * Wifi information menu item on the diagnostic screen */ diff --git a/src/com/android/settings/wifi/WifiStatusTest.java b/src/com/android/settings/wifi/WifiStatusTest.java index ca7f5f7fecd..249cd710fd6 100644 --- a/src/com/android/settings/wifi/WifiStatusTest.java +++ b/src/com/android/settings/wifi/WifiStatusTest.java @@ -45,7 +45,6 @@ import java.net.URL; import java.net.UnknownHostException; import java.util.List; - /** * Show the current status details of Wifi related fields */ diff --git a/src/com/android/settings/wifi/calling/ListWithEntrySummaryPreference.java b/src/com/android/settings/wifi/calling/ListWithEntrySummaryPreference.java index a44fcbeba74..b91b39db762 100644 --- a/src/com/android/settings/wifi/calling/ListWithEntrySummaryPreference.java +++ b/src/com/android/settings/wifi/calling/ListWithEntrySummaryPreference.java @@ -30,7 +30,9 @@ import android.widget.ArrayAdapter; import android.widget.ListAdapter; import android.widget.RadioButton; import android.widget.TextView; + import androidx.appcompat.app.AlertDialog.Builder; + import com.android.settings.CustomListPreference; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java index 26d742d530e..3c1649ec7ca 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java @@ -18,9 +18,9 @@ package com.android.settings.wifi.calling; import static android.app.slice.Slice.EXTRA_TOGGLE_STATE; +import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME; import static com.android.settings.slices.CustomSliceRegistry.WIFI_CALLING_PREFERENCE_URI; import static com.android.settings.slices.CustomSliceRegistry.WIFI_CALLING_URI; -import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME; import android.app.PendingIntent; import android.content.ComponentName; @@ -43,7 +43,6 @@ import androidx.slice.builders.ListBuilder; import androidx.slice.builders.ListBuilder.RowBuilder; import androidx.slice.builders.SliceAction; -import com.android.ims.ImsConfig; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.network.ims.WifiCallingQueryImsState; @@ -57,7 +56,6 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; - /** * Helper class to control slices for wifi calling settings. */ diff --git a/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java index 2a93005cc22..52645aaf4eb 100644 --- a/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java +++ b/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java @@ -27,7 +27,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; import com.android.settings.wifi.WifiDialog2; -import com.android.settingslib.core.AbstractPreferenceController; import com.android.wifitrackerlib.WifiEntry; /** diff --git a/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java index d6e1b6054d3..c4849225641 100644 --- a/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java +++ b/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java @@ -28,7 +28,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.wifi.WifiDialog2; -import com.android.settingslib.core.AbstractPreferenceController; import com.android.wifitrackerlib.WifiEntry; /** diff --git a/src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java b/src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java index 616c92fb33a..1308c0e2bc3 100644 --- a/src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java +++ b/src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java @@ -20,8 +20,6 @@ import android.content.Context; import android.net.Uri; import android.os.SystemClock; -import com.android.settings.slices.SliceBackgroundWorker; - /** * {@link SliceBackgroundWorker} for Wi-Fi, used by {@link ContextualWifiSlice}. */ diff --git a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java index 1b9c487d119..464d9a25cc0 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java @@ -35,10 +35,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import java.util.ArrayList; import java.util.List; -import org.robolectric.RobolectricTestRunner; @RunWith(RobolectricTestRunner.class) public class RegulatoryInfoPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java index aad3f30fa53..d96473bf922 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java @@ -34,10 +34,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import java.util.ArrayList; import java.util.List; -import org.robolectric.RobolectricTestRunner; @RunWith(RobolectricTestRunner.class) public class StorageSettingsTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceControllerTest.java index 823014471f7..79df2215545 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceControllerTest.java @@ -39,7 +39,6 @@ import org.robolectric.annotation.Config; import java.util.Arrays; - @RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowConnectivityManager.class) public class BasebandVersionPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java index a854c04ec2b..afe9cfcc3ca 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java @@ -34,7 +34,6 @@ import static com.android.settings.deviceinfo.simstatus.SimStatusDialogControlle import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SIGNAL_STRENGTH_LABEL_ID; import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SIGNAL_STRENGTH_VALUE_ID; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; diff --git a/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java index b269b05b82b..8a819087296 100644 --- a/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.network; - import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.eq; diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkListControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkListControllerTest.java index 95d60a446fc..355dda8d86a 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkListControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkListControllerTest.java @@ -39,6 +39,10 @@ import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.telephony.euicc.EuiccManager; +import androidx.lifecycle.Lifecycle; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import org.junit.After; import org.junit.Before; import org.junit.Ignore; @@ -52,10 +56,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.Arrays; -import androidx.lifecycle.Lifecycle; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - @RunWith(RobolectricTestRunner.class) public class MobileNetworkListControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkListFragmentTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkListFragmentTest.java index a65ff24f455..fd2b520929f 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkListFragmentTest.java @@ -33,7 +33,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; - @RunWith(RobolectricTestRunner.class) public class MobileNetworkListFragmentTest { @Mock diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java index efb77eba402..390a6744d1d 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java @@ -60,8 +60,8 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; +import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java b/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java index 84e88cb9b4c..446eef1c608 100644 --- a/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java +++ b/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java @@ -15,7 +15,6 @@ */ package com.android.settings.sim; - import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.provider.Settings.ENABLE_MMS_DATA_REQUEST_REASON_INCOMING_MMS; import static android.provider.Settings.ENABLE_MMS_DATA_REQUEST_REASON_OUTGOING_MMS; diff --git a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java index 6f3230cff4f..81f8e6342d8 100644 --- a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java @@ -24,14 +24,12 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import android.content.Context; import android.content.res.Resources; import android.telephony.SubscriptionManager; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceControllerTest.java index f9271a65e4c..13842b5cd5d 100644 --- a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceControllerTest.java @@ -26,7 +26,6 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.provider.Settings; -import androidx.preference.Preference; import androidx.preference.SwitchPreference; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java b/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java index 4cfc9ba271c..8478a5471ac 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java @@ -16,10 +16,11 @@ package com.android.settings.wifi.calling; -import static com.android.settings.wifi.calling.DisclaimerItemListAdapter - .DisclaimerItemViewHolder.ID_DISCLAIMER_ITEM_TITLE; import static com.android.settings.wifi.calling.DisclaimerItemListAdapter .DisclaimerItemViewHolder.ID_DISCLAIMER_ITEM_DESCRIPTION; +import static com.android.settings.wifi.calling.DisclaimerItemListAdapter + .DisclaimerItemViewHolder.ID_DISCLAIMER_ITEM_TITLE; + import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; @@ -33,11 +34,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.android.settings.R; - -import java.util.ArrayList; -import java.util.List; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -45,6 +41,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; +import java.util.ArrayList; +import java.util.List; + @RunWith(RobolectricTestRunner.class) public class DisclaimerItemListAdapterTest { diff --git a/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java b/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java index ce803245ab2..985edda69b5 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java @@ -17,10 +17,10 @@ package com.android.settings.wifi.calling; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -29,11 +29,9 @@ import android.content.SharedPreferences; import android.os.PersistableBundle; import android.telephony.CarrierConfigManager; -import com.android.settings.R; - import org.junit.Before; -import org.junit.runner.RunWith; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java b/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java index 94942883e8b..3fe9678c26e 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java @@ -17,12 +17,10 @@ package com.android.settings.wifi.calling; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyBoolean; + import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -31,11 +29,9 @@ import android.content.SharedPreferences; import android.os.PersistableBundle; import android.telephony.CarrierConfigManager; -import com.android.settings.R; - import org.junit.Before; -import org.junit.runner.RunWith; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java index 2e93faac27e..99992b6b7a3 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java @@ -16,12 +16,12 @@ package com.android.settings.wifi.calling; +import static junit.framework.Assert.assertEquals; + import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT; import static com.google.common.truth.Truth.assertThat; -import static junit.framework.Assert.assertEquals; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java index 25ad7308bfa..a42307193ec 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java @@ -16,7 +16,7 @@ package com.android.settings.wifi.tether; -import static org.mockito.ArgumentMatchers.anyString;; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/unit/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java b/tests/unit/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java index cdb82a66b7b..c51bb18f376 100644 --- a/tests/unit/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java +++ b/tests/unit/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java @@ -41,7 +41,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; - @RunWith(AndroidJUnit4.class) public class MultiNetworkHeaderControllerTest { private static final String KEY_HEADER = "multi_network_header"; diff --git a/tests/unit/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java index f1ad2ffb4a5..ccc12e369d9 100644 --- a/tests/unit/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java @@ -38,7 +38,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; - @RunWith(AndroidJUnit4.class) public class EuiccPreferenceControllerTest { private static final int SUB_ID = 2; diff --git a/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java index 0feabf2d995..c35942afef9 100644 --- a/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java @@ -46,7 +46,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; - @RunWith(AndroidJUnit4.class) public class MobileDataPreferenceControllerTest { private static final int SUB_ID = 2; diff --git a/tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java b/tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java index 014d8ea9f6d..a30d6108acf 100644 --- a/tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java +++ b/tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java @@ -17,6 +17,7 @@ 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;